@malloydata/malloy 0.0.80-dev230906223653 → 0.0.80-dev230907131802

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -92,6 +92,8 @@ import { BlockSQLDefContext } from "./MalloyParser";
 import { SqlStringContext } from "./MalloyParser";
 import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
+import { ImportSelectContext } from "./MalloyParser";
+import { ImportItemContext } from "./MalloyParser";
 import { ImportURLContext } from "./MalloyParser";
 import { DocAnnotationsContext } from "./MalloyParser";
 import { IgnoredObjectAnnotationsContext } from "./MalloyParser";
@@ -1297,6 +1299,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitImportStatement?: (ctx: ImportStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.importSelect`.
+     * @param ctx the parse tree
+     */
+    enterImportSelect?: (ctx: ImportSelectContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.importSelect`.
+     * @param ctx the parse tree
+     */
+    exitImportSelect?: (ctx: ImportSelectContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.importItem`.
+     * @param ctx the parse tree
+     */
+    enterImportItem?: (ctx: ImportItemContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.importItem`.
+     * @param ctx the parse tree
+     */
+    exitImportItem?: (ctx: ImportItemContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.importURL`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -92,6 +92,8 @@ import { BlockSQLDefContext } from "./MalloyParser";
 import { SqlStringContext } from "./MalloyParser";
 import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
+import { ImportSelectContext } from "./MalloyParser";
+import { ImportItemContext } from "./MalloyParser";
 import { ImportURLContext } from "./MalloyParser";
 import { DocAnnotationsContext } from "./MalloyParser";
 import { IgnoredObjectAnnotationsContext } from "./MalloyParser";
@@ -849,6 +851,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitImportStatement?: (ctx: ImportStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.importSelect`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitImportSelect?: (ctx: ImportSelectContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.importItem`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitImportItem?: (ctx: ImportItemContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.importURL`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.js

@@ -303,6 +303,10 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const source = this.visitUnextendableSource(pcx.unextendableSource());
         const query = new ast.FullQuery(source);
         query.turtleName = this.getFieldName(pcx);
+        const idTxt = pcx.id().text;
+        if (this.m4WarningsEnabled() && pcx.ARROW()) {
+            this.contextError(pcx, `Use '.${idTxt}' instead of '->${idTxt}' to reference the query contained in the source`, 'warn');
+        }
         return this.astAt(query, pcx);
     }
     visitQueryByName(pcx) {
@@ -1199,7 +1203,18 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitImportStatement(pcx) {
         const url = this.getPlainString(pcx.importURL());
-        return this.astAt(new ast.ImportStatement(url, this.parseInfo.sourceURL), pcx);
+        const importStmt = this.astAt(new ast.ImportStatement(url, this.parseInfo.sourceURL), pcx);
+        const selectCx = pcx.importSelect();
+        if (selectCx) {
+            for (const item of selectCx.importItem()) {
+                const ids = item.id();
+                const oldName = ids[1]
+                    ? this.astAt(new ast.ImportSourceName((0, parse_utils_1.idToStr)(ids[1])), ids[1])
+                    : undefined;
+                importStmt.push(this.astAt(new ast.ImportSelect((0, parse_utils_1.idToStr)(ids[0]), oldName), ids[0]));
+            }
+        }
+        return importStmt;
     }
     visitJustExpr(pcx) {
         return this.getFieldExpr(pcx.fieldExpr());

package/dist/lang/parse-utils.d.ts

@@ -35,6 +35,7 @@ export type HasID = ParserRuleContext & {
  * @returns The indenftifier text
  */
 export declare function getId(cx: HasID): string;
+export declare function idToStr(cx: IdContext): string;
 export declare function getOptionalId(cx: ParserRuleContext): string | undefined;
 export declare function unIndent(parts: (string | unknown)[]): void;
 export {};

package/dist/lang/parse-utils.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unIndent = exports.getOptionalId = exports.getId = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
+exports.unIndent = exports.getOptionalId = exports.idToStr = exports.getId = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
 /**
  * Take the text of a matched string, including the matching quote
  * characters, and return the actual contents of the string after
@@ -152,13 +152,17 @@ exports.parseString = parseString;
  * @returns The indenftifier text
  */
 function getId(cx) {
-    const quoted = cx.id().BQ_STRING();
+    return idToStr(cx.id());
+}
+exports.getId = getId;
+function idToStr(cx) {
+    const quoted = cx.BQ_STRING();
     if (quoted) {
         return parseString(quoted.text, '`');
     }
-    return cx.id().text;
+    return cx.text;
 }
-exports.getId = getId;
+exports.idToStr = idToStr;
 function getOptionalId(cx) {
     function containsID(cx) {
         return 'id' in cx;

package/dist/lang/test/imports.spec.js

@@ -159,5 +159,71 @@ source: botProjQSrc is from(->botProjQ)
             }
         }
     });
+    test('selective import of source', () => {
+        const docParse = new test_translator_1.TestTranslator('import { bb } from "child"');
+        const xr = docParse.unresolved();
+        expect(docParse).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        docParse.update({
+            urls: {
+                'internal://test/langtests/child': 'source: aa is a; source: bb is a',
+            },
+        });
+        expect(docParse).toTranslate();
+        const bb = docParse.getSourceDef('bb');
+        expect(bb).toBeDefined();
+        const aa = docParse.getSourceDef('aa');
+        expect(aa).toBeUndefined();
+    });
+    test('renaming import of source', () => {
+        const docParse = new test_translator_1.TestTranslator('import { bb is aa } from "child"');
+        const xr = docParse.unresolved();
+        expect(docParse).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        docParse.update({
+            urls: { 'internal://test/langtests/child': 'source: aa is a' },
+        });
+        expect(docParse).toTranslate();
+        const bb = docParse.getSourceDef('bb');
+        expect(bb).toBeDefined();
+    });
+    test('selective import of source, not found', () => {
+        const doc = (0, test_translator_1.model) `import { ${'bb'} } from "child"`;
+        const xr = doc.translator.unresolved();
+        expect(doc).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        doc.translator.update({
+            urls: {
+                'internal://test/langtests/child': 'source: aa is a',
+            },
+        });
+        expect(doc.translator).translationToFailWith("Cannot find 'bb', not imported");
+    });
+    test('selective renamed import of source, not found', () => {
+        const doc = (0, test_translator_1.model) `import { cc is ${'bb'} } from "child"`;
+        const xr = doc.translator.unresolved();
+        expect(doc).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        doc.translator.update({
+            urls: {
+                'internal://test/langtests/child': 'source: aa is a',
+            },
+        });
+        expect(doc.translator).translationToFailWith("Cannot find 'bb', not imported");
+    });
+    test('selective import of source, no-redefinition', () => {
+        const doc = (0, test_translator_1.model) `
+      import { cc is ${'bb'} } from "child"
+      import { cc is ${'bb'} } from "child"`;
+        const xr = doc.translator.unresolved();
+        expect(doc).toParse();
+        expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
+        doc.translator.update({
+            urls: {
+                'internal://test/langtests/child': 'source: bb is a',
+            },
+        });
+        expect(doc.translator).translationToFailWith("Cannot redefine 'cc'");
+    });
 });
 //# sourceMappingURL=imports.spec.js.map

package/dist/lang/test/query.spec.js

@@ -64,17 +64,22 @@ describe('query:', () => {
     test('from(query) refined into query', () => {
         expect('query: from(ab -> {group_by: astr}) { dimension: bigstr is upper(astr) } -> { group_by: bigstr }').toTranslate();
     });
+    test('arrow turtle geenrates m4 warning', () => {
+        expect(`##! m4warnings
+      run: ab -> aturtle
+  `).toTranslateWithWarnings("Use '.aturtle' instead of '->aturtle' to reference the query contained in the source");
+    });
     test('query with shortcut filtered turtle', () => {
-        expect("query: allA is ab->aturtle {? astr ~ 'a%' }").toTranslate();
+        expect("query: allA is ab.aturtle {? astr ~ 'a%' }").toTranslate();
     });
     test('query with shortcut filtered turtle m4warning', () => {
         expect(`
       ##! m4warnings
-      query: allA is ab->aturtle refine {? astr ~ 'a%' }
+      query: allA is ab.aturtle refine {? astr ~ 'a%' }
     `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
     });
     test('query with filtered turtle', () => {
-        expect("query: allA is ab->aturtle { where: astr ~ 'a%' }").toTranslate();
+        expect("query: allA is ab.aturtle { where: astr ~ 'a%' }").toTranslate();
     });
     test('nest: in group_by:', () => {
         expect(`
@@ -903,7 +908,7 @@ describe('query:', () => {
             declare: aratio is ai / acount
           }
         }
-        query: nab -> xturtle + { aggregate: aratio }
+        query: nab.xturtle + { aggregate: aratio }
       `);
             expect(m).toTranslate();
             const t = m.translate();
@@ -925,7 +930,7 @@ describe('query:', () => {
         });
         test('refine query source with field', () => {
             const m = new test_translator_1.TestTranslator(`
-        query: ab -> aturtle + {
+        query: ab.aturtle + {
           declare: aratio is ai / acount
           aggregate: aratio
         }
@@ -949,7 +954,7 @@ describe('query:', () => {
         });
         test('refine query source with join', () => {
             const m = new test_translator_1.TestTranslator(`
-        query: ab -> aturtle + {
+        query: ab.aturtle + {
           join_one: bb is b on bb.astr = astr
           group_by: foo is bb.astr
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.80-dev230906223653",
+  "version": "0.0.80-dev230907131802",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",