oc 0.50.25 → 0.50.27

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Change Log
 
+### v0.50.27
+- [#1435](https://github.com/opencomponents/oc/pull/1435) Fix loading info correctly
+
+### v0.50.26
+- [#1434](https://github.com/opencomponents/oc/pull/1434) add fallback client option and new oc.json section for dev
+
 ### v0.50.25
 - [#1433](https://github.com/opencomponents/oc/pull/1433) update oc client browser
 

package/dist/cli/domain/get-mocked-plugins.d.ts

@@ -7,5 +7,5 @@ interface PluginMock {
         execute: (...args: unknown[]) => unknown;
     };
 }
-export default function getMockedPlugins(logger: Logger, componentsDir: string): PluginMock[];
+export default function getMockedPlugins(logger: Logger, componentsDir?: string): PluginMock[];
 export {};

package/dist/cli/domain/get-mocked-plugins.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getMockedPlugins;
 const node_path_1 = __importDefault(require("node:path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const resources_1 = __importDefault(require("../../resources/"));
-const settings_1 = __importDefault(require("../../resources/settings"));
+const ocConfig_1 = require("./ocConfig");
 const isMockValid = (plugin) => {
     const isFunction = typeof plugin === 'function';
     const isValidObject = !!plugin &&
@@ -56,34 +55,18 @@ const registerDynamicMocks = (ocJsonLocation, mocks, logger) => Object.entries(m
     };
 })
     .filter((pluginMock) => !!pluginMock);
-const findPath = (pathToResolve, fileName) => {
-    const rootDir = fs_extra_1.default.realpathSync('.');
-    const fileToResolve = node_path_1.default.join(pathToResolve, fileName);
-    if (!fs_extra_1.default.existsSync(fileToResolve)) {
-        if (pathToResolve === rootDir) {
-            return undefined;
-        }
-        const getParent = (pathToResolve) => pathToResolve.split('/').slice(0, -1).join('/');
-        const parentDir = pathToResolve ? getParent(pathToResolve) : rootDir;
-        return findPath(parentDir, fileName);
-    }
-    return fileToResolve;
-};
 function getMockedPlugins(logger, componentsDir) {
     componentsDir = node_path_1.default.resolve(componentsDir || '.');
     let plugins = [];
-    const ocJsonFileName = settings_1.default.configFile.src.replace('./', '');
-    const ocJsonPath = findPath(componentsDir, ocJsonFileName);
-    if (!ocJsonPath) {
-        return plugins;
-    }
-    const content = fs_extra_1.default.readJsonSync(ocJsonPath);
-    const ocJsonLocation = ocJsonPath.slice(0, -ocJsonFileName.length);
-    if (!content.mocks || !content.mocks.plugins) {
+    const content = (0, ocConfig_1.getOcConfig)(componentsDir);
+    const ocJsonLocation = content.sourcePath
+        ? node_path_1.default.dirname(content.sourcePath)
+        : componentsDir;
+    if (!content.development?.plugins) {
         return plugins;
     }
     logger.warn(resources_1.default.messages.cli.REGISTERING_MOCKED_PLUGINS);
-    plugins = plugins.concat(registerStaticMocks(content.mocks.plugins.static ?? {}, logger));
-    plugins = plugins.concat(registerDynamicMocks(ocJsonLocation, content.mocks.plugins.dynamic ?? {}, logger));
+    plugins = plugins.concat(registerStaticMocks(content.development.plugins.static ?? {}, logger));
+    plugins = plugins.concat(registerDynamicMocks(ocJsonLocation, content.development.plugins.dynamic ?? {}, logger));
     return plugins;
 }

package/dist/cli/domain/local.d.ts

@@ -12,7 +12,7 @@ export default function local(): {
         templateType: string;
     }): Promise<void>;
     mock: (params: {
-        targetType: string;
+        targetType: "plugin";
         targetValue: string;
         targetName: string;
     }) => Promise<void>;

package/dist/cli/domain/mock.d.ts

@@ -1,5 +1,5 @@
 export default function mock(): (params: {
-    targetType: string;
+    targetType: "plugin";
     targetValue: string;
     targetName: string;
 }) => Promise<void>;

package/dist/cli/domain/mock.js

@@ -6,28 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = mock;
 const node_path_1 = __importDefault(require("node:path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const settings_1 = __importDefault(require("../../resources/settings"));
+const ocConfig_1 = require("./ocConfig");
 function mock() {
     return async (params) => {
-        const localConfig = await fs_extra_1.default
-            .readJson(settings_1.default.configFile.src)
-            .catch(() => ({}));
-        const mockType = params.targetType + 's';
-        if (!localConfig.mocks) {
-            localConfig.mocks = {};
-        }
-        if (!localConfig.mocks[mockType]) {
-            localConfig.mocks[mockType] = {};
+        const localConfig = (0, ocConfig_1.getOcConfig)();
+        const mockType = `${params.targetType}s`;
+        if (!localConfig.development[mockType]) {
+            localConfig.development[mockType] = {};
         }
         let pluginType = 'static';
         if (fs_extra_1.default.existsSync(node_path_1.default.resolve(params.targetValue.toString()))) {
             pluginType = 'dynamic';
         }
-        if (!localConfig.mocks[mockType][pluginType]) {
-            localConfig.mocks[mockType][pluginType] = {};
+        if (!localConfig.development[mockType][pluginType]) {
+            localConfig.development[mockType][pluginType] = {};
         }
-        localConfig.mocks[mockType][pluginType][params.targetName] =
+        localConfig.development[mockType][pluginType][params.targetName] =
             params.targetValue;
-        return fs_extra_1.default.writeJson(settings_1.default.configFile.src, localConfig, { spaces: 2 });
+        return (0, ocConfig_1.setOcConfig)(localConfig);
     };
 }

package/dist/cli/domain/ocConfig.d.ts

@@ -0,0 +1,50 @@
+export interface OpenComponentsConfig {
+    /** JSON schema specification reference */
+    $schema?: string | null;
+    /** List of registry URLs where components will be published */
+    registries?: string[];
+    /** Development-specific configuration settings */
+    development?: {
+        /** Fallback configuration for when components cannot be found locally */
+        fallback?: {
+            /** URL of the fallback registry to use when components cannot be found locally */
+            url: string;
+            /** Whether to use the fallback registry's oc-client-browser.js for previewing components */
+            client?: boolean;
+        };
+        /** Plugin mocking configuration for development */
+        plugins?: {
+            /** Dynamic plugin mocks - file paths to JavaScript modules */
+            dynamic?: Record<string, string>;
+            /** Static plugin mocks - static values that will always be returned */
+            static?: Record<string, string>;
+        };
+    };
+    /** @deprecated Use development.plugins instead */
+    mocks?: {
+        /** @deprecated Use development.plugins instead */
+        plugins?: {
+            /** @deprecated Use development.plugins.dynamic instead */
+            dynamic?: Record<string, string>;
+            /** @deprecated Use development.plugins.static instead */
+            static?: Record<string, string>;
+        };
+    };
+}
+type ParsedConfig = {
+    sourcePath?: string;
+    registries: string[];
+    development: {
+        plugins: {
+            dynamic?: Record<string, string>;
+            static?: Record<string, string>;
+        };
+        fallback?: {
+            url: string;
+            client?: boolean;
+        };
+    };
+};
+export declare function getOcConfig(folder?: string): ParsedConfig;
+export declare function setOcConfig(config: ParsedConfig, path?: string): void;
+export {};

package/dist/cli/domain/ocConfig.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOcConfig = getOcConfig;
+exports.setOcConfig = setOcConfig;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const settings_1 = __importDefault(require("../../resources/settings"));
+const findPath = (pathToResolve, fileName) => {
+    const rootDir = node_fs_1.default.realpathSync('.');
+    const fileToResolve = node_path_1.default.join(pathToResolve, fileName);
+    if (!node_fs_1.default.existsSync(fileToResolve)) {
+        if (pathToResolve === rootDir) {
+            return undefined;
+        }
+        const getParent = (pathToResolve) => pathToResolve.split('/').slice(0, -1).join('/');
+        const parentDir = pathToResolve ? getParent(pathToResolve) : rootDir;
+        return findPath(parentDir, fileName);
+    }
+    return fileToResolve;
+};
+function parseConfig(config) {
+    const plugins = {
+        ...(config.mocks?.plugins || {}),
+        ...(config.development?.plugins || {})
+    };
+    const parsedConfig = {
+        ...config,
+        registries: config.registries || [],
+        development: {
+            plugins,
+            fallback: config.development?.fallback
+        }
+    };
+    return parsedConfig;
+}
+function getOcConfig(folder) {
+    const configPath = folder
+        ? findPath(folder, settings_1.default.configFile.src.replace('./', '')) ||
+            settings_1.default.configFile.src
+        : settings_1.default.configFile.src;
+    try {
+        const config = JSON.parse(node_fs_1.default.readFileSync(configPath, 'utf8'));
+        return { ...parseConfig(config), sourcePath: configPath };
+    }
+    catch {
+        return {
+            registries: [],
+            development: {
+                plugins: {}
+            }
+        };
+    }
+}
+function setOcConfig(config, path) {
+    const { sourcePath, ...rest } = config;
+    node_fs_1.default.writeFileSync(path || sourcePath || settings_1.default.configFile.src, JSON.stringify(rest, null, 2));
+}

package/dist/cli/domain/package-components.js

@@ -93,6 +93,7 @@ const packageComponents = () => async (options) => {
         verbose,
         production
     };
+    console.log('compiling component', componentPath);
     const ocTemplate = (0, require_template_1.default)(type, {
         compiler: true,
         componentPath

package/dist/cli/domain/registry.js

@@ -44,6 +44,7 @@ const urlBuilder = __importStar(require("../../registry/domain/url-builder"));
 const settings_1 = __importDefault(require("../../resources/settings"));
 const put_1 = __importDefault(require("../../utils/put"));
 const urlParser = __importStar(require("../domain/url-parser"));
+const ocConfig_1 = require("./ocConfig");
 const getOcVersion = () => {
     const ocPackagePath = node_path_1.default.join(__dirname, '../../../package.json');
     const ocInfo = fs_extra_1.default.readJsonSync(ocPackagePath);
@@ -66,16 +67,14 @@ function registry(opts = {}) {
                     throw 'oc registry not available';
                 if (apiResponse.type !== 'oc-registry')
                     throw 'not a valid oc registry';
-                const res = await fs_extra_1.default
-                    .readJson(settings_1.default.configFile.src)
-                    .catch(() => ({}));
+                const res = (0, ocConfig_1.getOcConfig)();
                 if (!res.registries) {
                     res.registries = [];
                 }
                 if (!res.registries.includes(registry)) {
                     res.registries.push(registry);
                 }
-                return fs_extra_1.default.writeJson(settings_1.default.configFile.src, res);
+                return (0, ocConfig_1.setOcConfig)(res);
             }
             catch {
                 throw 'oc registry not available';
@@ -86,7 +85,7 @@ function registry(opts = {}) {
                 return [opts.registry];
             }
             try {
-                const res = await fs_extra_1.default.readJson(settings_1.default.configFile.src);
+                const res = (0, ocConfig_1.getOcConfig)();
                 if (!res.registries || res.registries.length === 0)
                     throw 'No oc registries';
                 return res.registries;
@@ -142,11 +141,9 @@ function registry(opts = {}) {
             if (registry.slice(registry.length - 1) !== '/') {
                 registry += '/';
             }
-            const res = await fs_extra_1.default
-                .readJson(settings_1.default.configFile.src)
-                .catch(() => ({ registries: [] }));
-            res.registries = res.registries.filter((x) => x !== registry);
-            await fs_extra_1.default.writeJson(settings_1.default.configFile.src, res);
+            const res = (0, ocConfig_1.getOcConfig)();
+            res.registries = res.registries?.filter((x) => x !== registry) || [];
+            (0, ocConfig_1.setOcConfig)(res);
         }
     };
 }

package/dist/cli/facade/dev.js

@@ -46,6 +46,7 @@ const oc = __importStar(require("../../index"));
 const index_1 = __importDefault(require("../../resources/index"));
 const get_mocked_plugins_1 = __importDefault(require("../domain/get-mocked-plugins"));
 const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
+const ocConfig_1 = require("../domain/ocConfig");
 const watch_1 = __importDefault(require("../domain/watch"));
 const cliMessages = index_1.default.messages.cli;
 const cliErrors = index_1.default.errors.cli;
@@ -55,7 +56,21 @@ const dev = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts)
     const componentsDir = opts.dirPath;
     const port = opts.port || 3000;
     const baseUrl = opts.baseUrl || `http://localhost:${port}/`;
-    const fallbackRegistryUrl = opts.fallbackRegistryUrl;
+    let fallbackRegistryUrl = opts.fallbackRegistryUrl;
+    let fallbackClient = false;
+    if (!fallbackRegistryUrl) {
+        try {
+            const localConfig = (0, ocConfig_1.getOcConfig)(componentsDir);
+            if (!fallbackRegistryUrl &&
+                typeof localConfig.development?.fallback?.url === 'string') {
+                fallbackRegistryUrl = localConfig.development?.fallback?.url;
+            }
+            fallbackClient = !!localConfig.development?.fallback?.client;
+        }
+        catch {
+            // Config file doesn't exist or is invalid, continue without fallback
+        }
+    }
     const hotReloading = typeof opts.hotReloading === 'undefined' ? true : opts.hotReloading;
     const optWatch = typeof opts.watch === 'undefined' ? true : opts.watch;
     let packaging = false;
@@ -167,6 +182,7 @@ const dev = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts)
         discovery: true,
         env: { name: 'local' },
         fallbackRegistryUrl,
+        fallbackClient,
         hotReloading,
         liveReloadPort: liveReload.port,
         local: true,

package/dist/cli/facade/mock.d.ts

@@ -5,12 +5,12 @@ declare const mock: ({ local, logger }: {
     logger: Logger;
 }) => {
     (opts: {
-        targetType: string;
+        targetType: "plugin";
         targetValue: string;
         targetName: string;
     }): Promise<void>;
     (opts: {
-        targetType: string;
+        targetType: "plugin";
         targetValue: string;
         targetName: string;
     }, arguments__1: (error: unknown, value: void) => void): void;

package/dist/cli/facade/mock.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const universalify_1 = require("universalify");
 const index_1 = __importDefault(require("../../resources/index"));
 const mock = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    if (opts.targetType !== 'plugin') {
+        throw new Error('targetType must be "plugin"');
+    }
     await local.mock(opts);
     logger.ok(index_1.default.messages.cli.MOCKED_PLUGIN(opts.targetName, opts.targetValue));
 });

package/dist/components/oc-client/_package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.50.25",
+  "version": "0.50.27",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {
@@ -22,14 +22,14 @@
       ],
       "dataProvider": {
         "type": "node.js",
-        "hashKey": "91d64b9ede5ef940193c697620df913d73559409",
+        "hashKey": "8f29903f1d53f460ce634ecf007a25b1bd3f1cee",
         "src": "server.js",
         "size": 613
       }
     },
-    "version": "0.50.25",
+    "version": "0.50.27",
     "packaged": true,
-    "date": 1756131708213
+    "date": 1756270183453
   },
   "devDependencies": {
     "oc-template-es6-compiler": "^1.0.1"

package/dist/components/oc-client/_package/server.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},o=(t,s)=>{r(t,(e,a)=>{if(e)return s(e);if(a==null)return s(null,{__oc_emptyResponse:!0});const n=t.action?a:Object.assign({},a,{_staticPath:t.staticPath,_baseUrl:t.baseUrl,_componentName:"oc-client",_componentVersion:"0.50.25"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"8b7545cba94f7c029b9d46108bfe8e4e6040ea09",src:c+"template.js",props:n}}))})};exports.data=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},o=(t,s)=>{r(t,(e,a)=>{if(e)return s(e);if(a==null)return s(null,{__oc_emptyResponse:!0});const n=t.action?a:Object.assign({},a,{_staticPath:t.staticPath,_baseUrl:t.baseUrl,_componentName:"oc-client",_componentVersion:"0.50.27"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"8b7545cba94f7c029b9d46108bfe8e4e6040ea09",src:c+"template.js",props:n}}))})};exports.data=o;