@malloydata/malloy 0.0.412 → 0.0.414

package/dist/model/source_def_utils.js

@@ -10,7 +10,9 @@ exports.mkBuildID = mkBuildID;
 exports.mkQuerySourceDef = mkQuerySourceDef;
 exports.mkSQLSourceDef = mkSQLSourceDef;
 exports.mkTableSourceDef = mkTableSourceDef;
+exports.resolveSourceRef = resolveSourceRef;
 exports.resolveSourceID = resolveSourceID;
+exports.sourceNamespaceReference = sourceNamespaceReference;
 exports.registerSource = registerSource;
 exports.hasSourceRegistryEntry = hasSourceRegistryEntry;
 const utils_1 = require("./utils");
@@ -59,8 +61,9 @@ function mkQuerySourceDef(base, query, name) {
         dialect: base.dialect,
         partitionComposite: base.partitionComposite,
         errorFactory: base.errorFactory,
-        // PersistableSourceProperties - explicitly NOT copied
+        // Identity fields - explicitly NOT copied
         // sourceID: undefined,
+        // referenceID: undefined,
         // extends: undefined,
         // persistent: undefined,
     };
@@ -97,8 +100,9 @@ function mkSQLSourceDef(base, selectStr, selectSegments) {
         dialect: base.dialect,
         partitionComposite: base.partitionComposite,
         errorFactory: base.errorFactory,
-        // PersistableSourceProperties - explicitly NOT copied
+        // Identity fields - explicitly NOT copied
         // sourceID: undefined,
+        // referenceID: undefined,
         // extends: undefined,
         // persistent: undefined,
     };
@@ -120,25 +124,51 @@ function mkTableSourceDef(name, connection, tablePath, dialect, fields) {
 // Source Registry Utilities
 // =============================================================================
 /**
- * Resolve a sourceID to a SourceDef using the sourceRegistry.
+ * Resolve a SourceID (a source's own `sourceID`, or a `referenceID` pointing at
+ * one) to its SourceDef using the sourceRegistry, returning any kind of source.
  *
  * @param modelDef The model definition containing the registry
- * @param sourceID The sourceID to resolve
+ * @param sourceID The SourceID to resolve
  * @returns The SourceDef if found, undefined otherwise
  */
-function resolveSourceID(modelDef, sourceID) {
+function resolveSourceRef(modelDef, sourceID) {
     const value = modelDef.sourceRegistry[sourceID];
     if (!value)
         return undefined;
     if ((0, malloy_types_1.isSourceRegistryReference)(value.entry)) {
         const obj = (0, malloy_types_1.safeRecordGet)(modelDef.contents, value.entry.name);
-        return obj && (0, malloy_types_1.isSourceDef)(obj) && (0, malloy_types_1.isPersistableSourceDef)(obj)
-            ? obj
-            : undefined;
+        return obj && (0, malloy_types_1.isSourceDef)(obj) ? obj : undefined;
     }
-    // It's a PersistableSourceDef
     return value.entry;
 }
+/**
+ * Resolve a sourceID to a persistable SourceDef using the sourceRegistry.
+ *
+ * @param modelDef The model definition containing the registry
+ * @param sourceID The sourceID to resolve
+ * @returns The PersistableSourceDef if found, undefined otherwise
+ */
+function resolveSourceID(modelDef, sourceID) {
+    const sd = resolveSourceRef(modelDef, sourceID);
+    return sd && (0, malloy_types_1.isPersistableSourceDef)(sd) ? sd : undefined;
+}
+/**
+ * If `sd` was created as an unmodified reference to another source
+ * (`sd.referenceID` is set) and that source is present in this model's
+ * namespace, return it together with the name it goes by. Returns undefined
+ * when `sd` defines its own shape, or when the referenced source is not in this
+ * model's namespace (e.g. an imported source whose own target wasn't imported).
+ */
+function sourceNamespaceReference(modelDef, sd) {
+    if (sd.referenceID === undefined)
+        return undefined;
+    const value = modelDef.sourceRegistry[sd.referenceID];
+    if (!value || !(0, malloy_types_1.isSourceRegistryReference)(value.entry))
+        return undefined;
+    const name = value.entry.name;
+    const source = (0, malloy_types_1.safeRecordGet)(modelDef.contents, name);
+    return source && (0, malloy_types_1.isSourceDef)(source) ? { name, source } : undefined;
+}
 /**
  * Add an entry to the sourceRegistry.
  *

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.412";
+export declare const MALLOY_VERSION = "0.0.414";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.412';
+exports.MALLOY_VERSION = '0.0.414';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.412",
+  "version": "0.0.414",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.412",
-    "@malloydata/malloy-interfaces": "0.0.412",
-    "@malloydata/malloy-tag": "0.0.412",
+    "@malloydata/malloy-filter": "0.0.414",
+    "@malloydata/malloy-interfaces": "0.0.414",
+    "@malloydata/malloy-tag": "0.0.414",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",