@cms0/cms0 0.2.20 → 0.2.22

package/dist/cjs/libs/cli/config-loader.cjs

@@ -46,6 +46,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const crypto_1 = __importDefault(require("crypto"));
+const module_1 = require("module");
 const DEFAULT_CONFIG_BASENAMES = [
     "cms0.config.ts",
     "cms0.config.js",
@@ -145,9 +146,7 @@ function resolvePaths(cfgPath, config) {
     }
     const baseDir = path_1.default.dirname(cfgPath);
     const packageJsonPath = findNearestPackageJson(cfgPath);
-    const projectRoot = packageJsonPath
-        ? path_1.default.dirname(packageJsonPath)
-        : baseDir;
+    const projectRoot = packageJsonPath ? path_1.default.dirname(packageJsonPath) : baseDir;
     const entryFile = path_1.default.resolve(baseDir, config.entry);
     const tsconfigPath = config.tsconfig
         ? path_1.default.resolve(baseDir, config.tsconfig)
@@ -178,7 +177,7 @@ function findTsConfig(entryFile) {
     return undefined;
 }
 async function transpileTsModuleToTemp(tsPath, format) {
-    const ts = await Promise.resolve().then(() => __importStar(require("typescript")));
+    const ts = await loadTypescriptCompiler(tsPath);
     const source = fs_1.default.readFileSync(tsPath, "utf8");
     const transpiled = ts.transpileModule(source, {
         compilerOptions: {
@@ -204,3 +203,45 @@ function cleanupTempModule(tempPath) {
         // ignore cleanup failures
     }
 }
+async function loadTypescriptCompiler(tsPath) {
+    const attemptedErrors = [];
+    const manifestCandidates = [
+        findNearestPackageJson(tsPath),
+        path_1.default.join(process.cwd(), "package.json"),
+    ].filter((candidate) => Boolean(candidate && fs_1.default.existsSync(candidate)));
+    for (const manifest of manifestCandidates) {
+        try {
+            const resolver = (0, module_1.createRequire)(manifest);
+            const mod = resolver("typescript");
+            return normalizeTypescriptModule(mod);
+        }
+        catch (error) {
+            attemptedErrors.push(error);
+        }
+    }
+    try {
+        const mod = (0, module_1.createRequire)(path_1.default.resolve("package.json"))("typescript");
+        return normalizeTypescriptModule(mod);
+    }
+    catch (error) {
+        attemptedErrors.push(error);
+    }
+    try {
+        const mod = await Promise.resolve().then(() => __importStar(require("typescript")));
+        return normalizeTypescriptModule(mod);
+    }
+    catch (error) {
+        attemptedErrors.push(error);
+    }
+    throw new AggregateError(attemptedErrors, 'cms0: Unable to resolve the "typescript" package required to load cms0.config.* files. Ensure it is installed in your project.');
+}
+function normalizeTypescriptModule(mod) {
+    if (mod && typeof mod.transpileModule === "function") {
+        return mod;
+    }
+    const candidate = mod?.default;
+    if (candidate && typeof candidate.transpileModule === "function") {
+        return candidate;
+    }
+    throw new Error("cms0: resolved 'typescript' module does not provide transpileModule");
+}

package/dist/cjs/libs/cli/publisher.cjs

@@ -20,6 +20,17 @@ function shouldRetryPublishError(error) {
     }
     return true;
 }
+function trimTrailingSlashes(value) {
+    return value.replace(/\/+$/, "");
+}
+function buildSchemaPublishUrl(baseUrl) {
+    const normalized = trimTrailingSlashes(baseUrl);
+    return `${normalized}/schema`;
+}
+function buildHealthUrls(baseUrl) {
+    const normalized = trimTrailingSlashes(baseUrl);
+    return [`${normalized}/health`];
+}
 const startSpinner = (label) => {
     if (!process.stdout.isTTY) {
         console.log(`${label}...`);
@@ -47,7 +58,7 @@ const startSpinner = (label) => {
     };
 };
 async function waitForAdminReady(baseUrl, headers) {
-    const healthUrl = `${baseUrl.replace(/\/$/, "")}/ok`;
+    const healthUrls = buildHealthUrls(baseUrl);
     const maxWaitMs = 30_000;
     const startedAt = Date.now();
     const spinner = startSpinner("cms0: waiting for admin to reload");
@@ -55,15 +66,17 @@ async function waitForAdminReady(baseUrl, headers) {
     let attempt = 0;
     while (Date.now() - startedAt < maxWaitMs) {
         attempt += 1;
-        try {
-            const res = await fetch(healthUrl, { headers });
-            if (res.ok) {
-                spinner.stop("cms0: admin ready");
-                return true;
+        for (const healthUrl of healthUrls) {
+            try {
+                const res = await fetch(healthUrl, { headers });
+                if (res.ok) {
+                    spinner.stop("cms0: admin ready");
+                    return true;
+                }
+            }
+            catch {
+                // ignore transient errors during restart
             }
-        }
-        catch {
-            // ignore transient errors during restart
         }
         await sleep(Math.min(500 + attempt * 250, 2000));
     }
@@ -84,7 +97,7 @@ async function publishDescriptor(resolved, descriptor) {
         if (resolved.apiKey) {
             headers["Authorization"] = `Bearer ${resolved.apiKey}`;
         }
-        const target = `${resolved.apiBaseUrl.replace(/\/$/, "")}/schema`;
+        const target = buildSchemaPublishUrl(resolved.apiBaseUrl);
         const maxAttempts = 5;
         for (let attempt = 1; attempt <= maxAttempts; attempt++) {
             try {
@@ -96,7 +109,7 @@ async function publishDescriptor(resolved, descriptor) {
                 if (!res.ok) {
                     throw new PublishHttpError(res.status);
                 }
-                const ready = await waitForAdminReady(resolved.apiBaseUrl.replace(/\/$/, ""), headers);
+                const ready = await waitForAdminReady(trimTrailingSlashes(resolved.apiBaseUrl), headers);
                 if (!ready) {
                     console.warn("cms0: publish succeeded, but admin did not become healthy in time.");
                 }

package/dist/esm/custom-types/registry.js

@@ -8,6 +8,12 @@ const primitive = (type) => ({
 const fileFieldDescriptors = {
     name: primitive("string"),
     filename: primitive("string"),
+    storageKey: {
+        kind: "primitive",
+        type: "string",
+        optional: true,
+        nullable: false,
+    },
     extension: primitive("string"),
     mimeType: primitive("string"),
     size: primitive("number"),