Skip to content

Commit

Permalink
move to npm namespace of "malloydata"
Browse files Browse the repository at this point in the history
  • Loading branch information
bporterfield committed Jan 18, 2022
1 parent 9572085 commit 8b566e9
Show file tree
Hide file tree
Showing 69 changed files with 131 additions and 119 deletions.
32 changes: 22 additions & 10 deletions code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
## Malloy Alpha Code of Conduct
All members of the Malloy community must abide by the following Code of Conduct, adapted from the [Contributor Covenant](https://www.contributor-covenant.org/). Only by respecting each other can we develop a productive, collaborative community.

All members of the Malloy community must abide by the following Code of Conduct, adapted from the [Contributor Covenant](https://www.contributor-covenant.org/). Only by respecting each other can we develop a productive, collaborative community.

### Our Pledge

As members, contributors, and leaders of the Malloy community, we pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.


### Our Standards

Examples of behavior that contributes to a positive environment for our community include:

Demonstrating empathy and kindness toward other people
Expand All @@ -25,42 +27,52 @@ Publishing others' private information, such as a physical or email address, wit
Other conduct which could reasonably be considered inappropriate in a professional setting

### Enforcement Responsibilities

Community leaders (including maintainers and Malloy program managers) are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, harmful, or a violation of the Malloy Testing Agreement.

Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.


### Scope

This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community may include acting as an appointed representative at an online or offline event.

### Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the Malloy program managers at malloy-lang@google.com, or any member of the Malloy team. All complaints will be reviewed and investigated promptly and fairly.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the Malloy program managers at malloydata@google.com, or any member of the Malloy team. All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the reporter of any incident.

### Enforcement Guidelines

Community leaders may follow these Community Impact Guidelines in determining the consequences for an action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of actions.

**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.

### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.


**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the community.
### Attribution

### Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/), version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

4 changes: 2 additions & 2 deletions demo/malloy-demo-bq-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"run": "ts-node src/entry.ts"
},
"dependencies": {
"@malloy-lang/malloy": "*",
"@malloy-lang/db-bigquery": "*"
"@malloydata/malloy": "*",
"@malloydata/db-bigquery": "*"
}
}
2 changes: 1 addition & 1 deletion demo/malloy-demo-bq-cli/src/cli.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
import { InMemoryURLReader } from "@malloy-lang/malloy";
import { InMemoryURLReader } from "@malloydata/malloy";
import { run, pathToURL } from "./index";

const unModeledQuery =
Expand Down
4 changes: 2 additions & 2 deletions demo/malloy-demo-bq-cli/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
* GNU General Public License for more details.
*/
/* eslint-disable no-console */
import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { promises as fs } from "fs";
import * as path from "path";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { BigQueryConnection } from "@malloydata/db-bigquery";

export function pathToURL(filePath: string): malloy.URL {
return malloy.URL.fromString("file://" + path.resolve(filePath));
Expand Down
4 changes: 2 additions & 2 deletions docs/_scripts/build_docs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import path from "path";
import fs from "fs";
import { Malloy } from "@malloy-lang/malloy";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { Malloy } from "@malloydata/malloy";
import { BigQueryConnection } from "@malloydata/db-bigquery";
import { performance } from "perf_hooks";
import { renderDoc } from "./render_document";
import { renderFooter, renderSidebar, Section } from "./page";
Expand Down
4 changes: 2 additions & 2 deletions docs/_scripts/build_docs/render_document.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import "prismjs/components/prism-json";
import "prismjs/components/prism-sql";
import { runCode } from "./run_code";
import { log } from "./log";
import { Malloy } from "@malloy-lang/malloy";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { Malloy } from "@malloydata/malloy";
import { BigQueryConnection } from "@malloydata/db-bigquery";

Malloy.db = new BigQueryConnection("docs");

Expand Down
6 changes: 3 additions & 3 deletions docs/_scripts/build_docs/run_code.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* that depend on that model. If `--watch` is enabled, changes to a model file
* will cause relevant documents to recompile.
*/
import { DataStyles, HTMLView, JSONView } from "@malloy-lang/render";
import { Malloy, Runtime, URL, URLReader } from "@malloy-lang/malloy";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { DataStyles, HTMLView, JSONView } from "@malloydata/render";
import { Malloy, Runtime, URL, URLReader } from "@malloydata/malloy";
import { BigQueryConnection } from "@malloydata/db-bigquery";
import path from "path";
import { promises as fs } from "fs";
import { performance } from "perf_hooks";
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"samples"
],
"scripts": {
"clean": "yarn workspace @malloy-lang/malloy clean && yarn tsc --build --clean",
"build": "yarn workspace @malloy-lang/malloy build-parser && yarn tsc --build",
"clean": "yarn workspace @malloydata/malloy clean && yarn tsc --build --clean",
"build": "yarn workspace @malloydata/malloy build-parser && yarn tsc --build",
"build-extension": "yarn build && yarn workspace malloy-vscode package",
"lint": "yarn eslint '**/*.ts{,x}'",
"test": "yarn lint && yarn build && yarn workspaces run test",
Expand All @@ -34,9 +34,9 @@
"resolutions": {},
"devDependencies": {
"@jest/globals": "^26.6.2",
"@malloy-lang/db-bigquery": "*",
"@malloy-lang/malloy": "*",
"@malloy-lang/render": "*",
"@malloydata/db-bigquery": "*",
"@malloydata/malloy": "*",
"@malloydata/render": "*",
"@types/jest-expect-message": "^1.0.3",
"@types/md5": "^2.3.1",
"@types/prismjs": "^1.16.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-bigquery/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@malloy-lang/db-bigquery",
"name": "@malloydata/db-bigquery",
"version": "0.0.1",
"license": "GPL-2.0",
"main": "dist/index.js",
Expand All @@ -14,6 +14,6 @@
"@google-cloud/bigquery": "^5.5.0",
"@google-cloud/common": "^3.6.0",
"gaxios": "^4.2.0",
"@malloy-lang/malloy": "*"
"@malloydata/malloy": "*"
}
}
2 changes: 1 addition & 1 deletion packages/malloy-db-bigquery/src/bigquery.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { BigQueryConnection } from "./bigquery_connection";
import { BigQuery as BigQuerySDK, TableMetadata } from "@google-cloud/bigquery";
import * as util from "util";
Expand Down
6 changes: 3 additions & 3 deletions packages/malloy-db-bigquery/src/bigquery_connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import {
FieldTypeDef,
NamedStructDefs,
Connection,
} from "@malloy-lang/malloy";
import { parseTableURL } from "@malloy-lang/malloy";
import { PooledConnection } from "@malloy-lang/malloy";
} from "@malloydata/malloy";
import { parseTableURL } from "@malloydata/malloy";
import { PooledConnection } from "@malloydata/malloy";

export interface BigQueryManagerOptions {
credentials?: {
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-postgres/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@malloy-lang/db-postgres",
"name": "@malloydata/db-postgres",
"version": "0.0.1",
"license": "GPL-2.0",
"main": "dist/index.js",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@types/pg": "^8.6.1",
"@malloy-lang/malloy": "*",
"@malloydata/malloy": "*",
"pg": "^8.7.1"
}
}
2 changes: 1 addition & 1 deletion packages/malloy-db-postgres/src/postgres_connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
QueryData,
PooledConnection,
parseTableURL,
} from "@malloy-lang/malloy";
} from "@malloydata/malloy";
import { Client, Pool } from "pg";

const postgresToMalloyTypes: { [key: string]: AtomicFieldType } = {
Expand Down
6 changes: 3 additions & 3 deletions packages/malloy-db-test/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@malloy-lang/db-test",
"name": "@malloydata/db-test",
"version": "0.0.1",
"license": "GPL-2.0",
"main": "dist/index.js",
Expand All @@ -11,7 +11,7 @@
"build": "yarn tsc --build"
},
"dependencies": {
"@malloy-lang/malloy": "*",
"@malloy-lang/db-bigquery": "*"
"@malloydata/malloy": "*",
"@malloydata/db-bigquery": "*"
}
}
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/expr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// eslint-disable-next-line @typescript-eslint/no-explicit-any

import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

const runtimes = new RuntimeList([
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-test/src/handexpr.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
* GNU General Public License for more details.
*/

import { ModelDef, Query, StructDef } from "@malloy-lang/malloy";
import { ModelDef, Query, StructDef } from "@malloydata/malloy";
import { fStringEq, fStringLike } from "./test_utils";

import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

const runtimes = new RuntimeList(["bigquery"]);
Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/join.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
/* eslint-disable no-console */

import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

const joinModelText = `
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-test/src/malloy-to-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
*/
/* eslint-disable no-console */
import * as readline from "readline";
import { Malloy, MalloyTranslator } from "@malloy-lang/malloy";
import { pretty } from "@malloy-lang/malloy/src/lang/test-translator";
import { Malloy, MalloyTranslator } from "@malloydata/malloy";
import { pretty } from "@malloydata/malloy/src/lang/test-translator";
import { readFileSync } from "fs";

/*
Expand Down
6 changes: 3 additions & 3 deletions packages/malloy-db-test/src/malloy_query.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import { test } from "@jest/globals";
import { testModel } from "./models/faa_model";
import { fStringEq } from "./test_utils";

import "@malloy-lang/malloy/src/lang/jestery";
import * as malloy from "@malloy-lang/malloy";
import "@malloydata/malloy/src/lang/jestery";
import * as malloy from "@malloydata/malloy";

import { Query } from "@malloy-lang/malloy";
import { Query } from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

const runtimeList = new RuntimeList(["bigquery"]);
Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/models/faa_model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/

import { ModelDef, StructDef } from "@malloy-lang/malloy";
import { ModelDef, StructDef } from "@malloydata/malloy";
import { medicareModel, medicareStateFacts } from "./medicare_model";
import { fStringEq, fYearEq } from "../test_utils";

Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/models/medicare_model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/

import { StructDef } from "@malloy-lang/malloy";
import { StructDef } from "@malloydata/malloy";

// will it build?

Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-test/src/multi_connection.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

// eslint-disable-next-line @typescript-eslint/no-explicit-any

import * as malloy from "@malloy-lang/malloy";
import { Connection, EmptyURLReader } from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { Connection, EmptyURLReader } from "@malloydata/malloy";
import { BigQueryTestConnection, PostgresTestConnection } from "./runtimes";

const bqConnection = new BigQueryTestConnection("bigquery", {}, "malloy-data");
Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/orderby.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/

import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

const runtimes = new RuntimeList([
Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/performance.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as malloy from "@malloy-lang/malloy";
import * as malloy from "@malloydata/malloy";
import { RuntimeList } from "./runtimes";

// Chris, please rework.
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-db-test/src/production_models.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import fs from "fs";
import path from "path";
import { Runtime, URL } from "@malloy-lang/malloy";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { Runtime, URL } from "@malloydata/malloy";
import { BigQueryConnection } from "@malloydata/db-bigquery";

const SAMPLE_PROJECT_ROOT = path.join(__dirname, "../../../samples");

Expand Down
6 changes: 3 additions & 3 deletions packages/malloy-db-test/src/runtimes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
EmptyURLReader,
Result,
MalloyQueryData,
} from "@malloy-lang/malloy";
import { BigQueryConnection } from "@malloy-lang/db-bigquery";
import { PooledPostgresConnection } from "@malloy-lang/db-postgres";
} from "@malloydata/malloy";
import { BigQueryConnection } from "@malloydata/db-bigquery";
import { PooledPostgresConnection } from "@malloydata/db-postgres";

export class BigQueryTestConnection extends BigQueryConnection {
// we probably need a better way to do this.
Expand Down
2 changes: 1 addition & 1 deletion packages/malloy-db-test/src/test_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/

import { FilterExpression, Fragment } from "@malloy-lang/malloy";
import { FilterExpression, Fragment } from "@malloydata/malloy";

export function fStringEq(field: string, value: string): FilterExpression {
return {
Expand Down
4 changes: 2 additions & 2 deletions packages/malloy-render/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@malloy-lang/render",
"name": "@malloydata/render",
"version": "0.0.1",
"license": "GPL-2.0",
"main": "dist/index.js",
Expand All @@ -11,6 +11,6 @@
"build": "yarn tsc --build"
},
"dependencies": {
"@malloy-lang/malloy": "*"
"@malloydata/malloy": "*"
}
}
Loading

0 comments on commit 8b566e9

Please sign in to comment.