@ingestron/core 0.12.3 → 0.12.4

package/dist/compiler-fingerprint.json

@@ -3,7 +3,7 @@
     "dist/assets/schemas/ODCS-LICENSE": "c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4",
     "dist/assets/schemas/odcs-3.1.0.json": "1a35de14c688b400fef306564f66e2af3304f057cd5cd6e7b847c1a8bf252c5b",
     "dist/assets/schemas/provenance.json": "4b5eb1fd89b81223f7946113b651d5a3a18adaa28948e43c3615dd851fb6844e",
-    "dist/core/authoring.js": "405c818184960c93a0cd0c041af2d415d56f62670ff91b0fb5f0d2aeed1feb9b",
+    "dist/core/authoring.js": "c144374cccbb512be7b3cd26700bc29538236eeeb35493eeec3bab938e08ff2a",
     "dist/core/config.js": "b7e7138f7cc4a7b4ec8f6d0f0616c8802f2d802ec29aa09b40c1fc5c9324e016",
     "dist/core/connections.js": "37b797b402788e00c51f3cac93b87342d158ed9b279753db91006d2d6c66bb4a",
     "dist/core/connector-package.js": "de9729e9e4b0cf05bd1ef347e57ffd489245bb68efce5c313ccba72b78409f41",
@@ -23,7 +23,7 @@
     "dist/core/model-packs.js": "fee776ea0804dc66c9f140e57d94a3922d69c52d03c72079842ec43417616b0d",
     "dist/core/operations.js": "7f4a9eeee19d3e1e4c1beecc0350e38d386f012edfb31c3248efcd22ebd40a77",
     "dist/core/package-references.js": "bd3085eb6dcdac399d79af109d0a9e710a0532eba61e5298dc842aec9c7ef10a",
-    "dist/core/packages.js": "6af57d7f2b3d78837a39cf9b14a5d8151a6825dfce359680382fd8096a08d259",
+    "dist/core/packages.js": "c6bcbc90aa3597fcd4205b27136221229d9efedc9bfa68a83a134cb5e8f51d2b",
     "dist/core/planner.js": "974c6bac5c533a32a7c45f797ef4d857c644448aa243a929caca5917fb9f3fb8",
     "dist/core/project-build.js": "18ffe962068967af255e77f1dc48fa4dd9161cd50659a8a3d9ac3b161856082e",
     "dist/core/project-packages.js": "b031dd9e3c5c147e8e1ed589b5eab21b9067acbefc1d4cd1dc5b6b7018cc39cf",
@@ -43,7 +43,7 @@
     "dist/version.js": "48af2aa1e425f1e387c082bbf0ad2c0c8d757c468101a614c3864153a94e6889"
   },
   "sources": {
-    "src/core/authoring.ts": "e1f02cf6c50cda20a62c1ea318908854939ab5be7da7de829350c7e11788be01",
+    "src/core/authoring.ts": "4389a1c8994b1c5da6d470e29806e547d9e5c13ed481b5e34acbe919b6b4b3d8",
     "src/core/config.ts": "f282eb246438608e1951556dfeab9372daf65330a15a9d159d36d1f940370344",
     "src/core/connections.ts": "dbdaca4193efa203cffa02fd819b95f82bbd604a7678ba7dc6ba065205c49ce7",
     "src/core/connector-package.ts": "a36151f6ffb49836547984eae871023ad1ad69a136f33cd6ad608496f84c85f8",
@@ -63,7 +63,7 @@
     "src/core/model-packs.ts": "a110d319f6feeff22a2d0d3a99ce5e49e56817d0cc27ab77d831d04a945ddfd3",
     "src/core/operations.ts": "e0a5a0e869e96de4e869f89e0fd794cb9fa537a16fb1f37fd8cf2b7ca777c08d",
     "src/core/package-references.ts": "5c5cee7e140158928e2e5a37f426520c7c2f042546a37eed4507d79326181f5a",
-    "src/core/packages.ts": "5a8ac2c2c2b5ac70c97339d7d5b9d76ac44422566c1dcbb780323de512905fd4",
+    "src/core/packages.ts": "8a9b6612325de68ab2610f540bd39e4f899b06d1cc1fbd54ecfd2abb8b4e9c40",
     "src/core/planner.ts": "2c6f0d53e21cbb60fc2433e7da1245707133336274c60b9a5678614dabf09bca",
     "src/core/project-build.ts": "7fa5038e7e2ff2625a30ffae282369954a5989347c6435849b72c95f2e52e247",
     "src/core/project-packages.ts": "4c5cb98aeb5030db7cf2c851cd9e40ed9aae038517fba2d8d7159e884f08b7a0",

package/dist/core/authoring.js

@@ -5,10 +5,28 @@ import { resolve, dirname, relative } from "node:path";
 import { parseDocument, stringify } from "yaml";
 import { check, digest, canonical, merge, Problem } from "./errors.js";
 import { Configuration } from "./config.js";
-import { projectSchema } from "./schema.js";
+import { packageReferenceSchema, projectSchema } from "./schema.js";
 import { projectPackages } from "./project-packages.js";
 import { contractColumns } from "./contracts.js";
-import { fence, installedProviders, canonicalPackageReference, } from "./packages.js";
+import { fence, installedProviders, canonicalPackageReference, configuredPackageReference, resolvePackage, packageYaml, } from "./packages.js";
+function concisePackageReference(root, value) {
+    const pkg = packageReferenceSchema.parse(value);
+    const reference = configuredPackageReference(pkg);
+    const installed = resolvePackage(root, reference);
+    const manifest = packageYaml(installed.file);
+    const short = `${manifest.id}@${manifest.version}`;
+    try {
+        const selected = resolvePackage(root, short);
+        if (selected.entry.repository === installed.entry.repository &&
+            selected.entry.path === installed.entry.path &&
+            selected.entry.commit === installed.entry.commit)
+            return short;
+    }
+    catch {
+        // Keep an explicit reference if multiple installed packages share the ID.
+    }
+    return `${pkg.source}@${pkg.version}`;
+}
 const yaml = (text, file) => {
     const doc = parseDocument(text, { uniqueKeys: true });
     check(!doc.errors.length, "YAML", doc.errors[0]?.message ?? "Invalid YAML", file);
@@ -116,7 +134,8 @@ export function initialise(root, options) {
             "project.yaml": stringify({
                 apiVersion: "ingestron.project/v1",
                 id: options.id,
-                providers: { packages: {}, configurations: {} },
+                packages: {},
+                providers: { configurations: {} },
                 defaults: {},
                 environments: Object.fromEntries(environments.map((name) => [
                     name,
@@ -150,6 +169,16 @@ export function initialise(root, options) {
         name === ".gitignore" ||
         /^environments\/[\w-]+\.yaml$/.test(name));
     check(files["project.yaml"], "PROVIDER", "Provider must author a project");
+    const authored = yaml(files["project.yaml"], "project.yaml").toJS();
+    const providerPackages = authored.providers?.packages ?? {};
+    authored.packages ??= {};
+    for (const [name, value] of Object.entries(providerPackages)) {
+        check(!Object.hasOwn(authored.packages, name), "PACKAGE", `Duplicate package alias ${name}`);
+        authored.packages[name] = concisePackageReference(root, value);
+    }
+    if (authored.providers)
+        delete authored.providers.packages;
+    files["project.yaml"] = stringify(authored);
     // Providers may return JSON (valid YAML); editable scaffolds use block YAML.
     for (const [name, text] of Object.entries(files)) {
         if (name.endsWith(".yaml"))
@@ -161,12 +190,14 @@ export function initialise(root, options) {
 }
 export function migrateProvider(root, options) {
     const reader = new Configuration(root), doc = yaml(reader.text("project.yaml"), "project.yaml");
-    check(doc.hasIn(["providers", "packages", options.package]), "PACKAGE", "Unknown project package");
+    const location = doc.hasIn(["packages", options.package])
+        ? ["packages", options.package]
+        : ["providers", "packages", options.package];
+    check(doc.hasIn(location), "PACKAGE", "Unknown project package");
     const selected = providerReference(root, options.to);
-    doc.setIn(["providers", "packages", options.package], {
-        source: selected.source,
-        version: selected.version,
-    });
+    doc.setIn(location, location[0] === "packages"
+        ? concisePackageReference(root, `${selected.source}@${selected.version}`)
+        : { source: selected.source, version: selected.version });
     return preview(root, { "project.yaml": doc.toString() });
 }
 function flowFile(root, id) {
@@ -198,7 +229,7 @@ export function addFlow(root, options) {
             value: yaml(reader.text(file), file).toJS(),
         };
     });
-    const files = providerAuthor(root, `${pkg.source}@${pkg.version}`, {
+    const files = providerAuthor(root, resolvePackage(root, configuredPackageReference(pkg)).reference, {
         operation: "flow",
         options,
         configuration,

package/dist/core/packages.d.ts

@@ -194,6 +194,7 @@ export declare function packageLock(root: string): {
     }>;
 };
 export declare function resolvePackage(root: string, reference: string): {
+    reference: string;
     file: string;
     root: string;
     entry: {

package/dist/core/packages.js

@@ -332,7 +332,7 @@ export function resolvePackage(root, reference) {
     check(canonical(inventory(cache)) === canonical(Object.keys(entry.files).sort()), "PACKAGE", "Package file inventory changed");
     for (const [file, hash] of Object.entries(entry.files))
         check(digest(readFileSync(fence(cache, file))) === hash, "PACKAGE", `Package integrity failed: ${file}`);
-    return { file: fence(cache, entry.path), root: cache, entry };
+    return { reference, file: fence(cache, entry.path), root: cache, entry };
 }
 /** Derived information lives outside the integrity-checked source cache. */
 export function savePluginInformation(root, reference) {

package/dist/plugins/authoring.d.ts

@@ -1,4 +1,5 @@
 export declare function providerReference(root: string, reference: string): {
+    reference: string;
     file: string;
     root: string;
     entry: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ingestron/core",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "type": "module",
   "description": "Shared Ingestron project compiler, operations and editor schemas",
   "license": "Apache-2.0",