oc 0.50.63 → 0.50.64

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.63",
+  "version": "0.50.64",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {
@@ -23,14 +23,14 @@
       ],
       "dataProvider": {
         "type": "node.js",
-        "hashKey": "879a222b2e89b6a0685c2bad8ca3eb9798b6cc55",
+        "hashKey": "28a1d089593e21c02409631c4224cea4f72a23f2",
         "src": "server.js",
         "size": 644
       }
     },
-    "version": "0.50.63",
+    "version": "0.50.64",
     "packaged": true,
-    "date": 1787207196137
+    "date": 1789052430262
   },
   "devDependencies": {
     "oc-template-es6-compiler": "^8.0.0"

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},r=(t,s)=>{o(t,(e,a,i={})=>{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.63"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"c4abb6bf4dc6657fb718a45b64bd6b2cb92e874a",src:c+"template.js",props:n,esm:!1,development:void 0}}))})};exports.data=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=(t,s)=>{const{staticPath:e,templates:a}=t;return s(null,{staticPath:e,templates:a})},r=(t,s)=>{o(t,(e,a,i={})=>{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.64"}),c=t.staticPath.indexOf("http")===0?t.staticPath:"https:"+t.staticPath;return s(null,Object.assign({},{component:{key:"c4abb6bf4dc6657fb718a45b64bd6b2cb92e874a",src:c+"template.js",props:n,esm:!1,development:void 0}}))})};exports.data=r;

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

@@ -1,12 +1,12 @@
 {
   "name": "oc-client",
-  "version": "0.50.59",
+  "version": "0.50.63",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oc-client",
-      "version": "0.50.59",
+      "version": "0.50.63",
       "devDependencies": {
         "oc-template-es6-compiler": "^8.0.0"
       }
@@ -2501,9 +2501,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

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

@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.50.63",
+  "version": "0.50.64",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {

package/dist/registry/domain/repository.js

@@ -53,7 +53,7 @@ const metadata_adapter_options_1 = __importDefault(require("./metadata-adapter-o
 const metadata_index_1 = require("./metadata-index");
 const metadata_migration_1 = require("./metadata-migration");
 const register_templates_1 = __importDefault(require("./register-templates"));
-const storage_adapter_1 = __importDefault(require("./storage-adapter"));
+const storage_adapter_1 = __importStar(require("./storage-adapter"));
 const validator = __importStar(require("./validators"));
 const versionHandler = __importStar(require("./version-handler"));
 const packageInfo = fs_extra_1.default.readJsonSync(node_path_1.default.join(__dirname, '..', '..', '..', 'package.json'));
@@ -421,7 +421,7 @@ function repository(conf) {
                     throw err;
                 });
                 try {
-                    await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`);
+                    await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`, storage_adapter_1.isPrivateComponentFile);
                     await metadataStore.commitVersion(componentName, componentVersion, token);
                     invalidateComponentInfo(componentName, componentVersion);
                     metadataIndex.add(componentRow);
@@ -434,7 +434,7 @@ function repository(conf) {
                 }
                 return;
             }
-            await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`);
+            await cdn.putDir(pkgDetails.outputFolder, `${options.componentsDir}/${componentName}/${componentVersion}`, storage_adapter_1.isPrivateComponentFile);
             invalidateComponentInfo(componentName, componentVersion);
             void componentsCache
                 .refresh()

package/dist/registry/domain/storage-adapter.d.ts

@@ -1,4 +1,5 @@
 import type { StorageAdapter } from 'oc-storage-adapters-utils';
+export declare function isPrivateComponentFile(filePath: string): boolean;
 type RemovePromiseOverload<T> = T extends {
     (...args: infer B): void;
     (...args: any[]): Promise<any>;

package/dist/registry/domain/storage-adapter.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPrivateComponentFile = isPrivateComponentFile;
 exports.default = getPromiseBasedAdapter;
 const universalify_1 = require("universalify");
+const privateComponentFilePatterns = [/(\\|\/)server\.js/, /(\\|\/)\..+/];
+function isPrivateComponentFile(filePath) {
+    return privateComponentFilePatterns.some((pattern) => pattern.test(filePath));
+}
 const officialAdapters = {
     s3: { name: 'oc-s3-storage-adapter', firstPromiseBasedVersion: '1.2.0' },
     gs: { name: 'oc-gs-storage-adapter', firstPromiseBasedVersion: '1.1.0' },
@@ -28,11 +33,14 @@ function isLegacyAdapter(adapter) {
     return !isPromiseBased(() => adapter.getFile(''));
 }
 function convertLegacyAdapter(adapter) {
+    const putDir = (0, universalify_1.fromCallback)(adapter.putDir);
     return {
         getFile: (0, universalify_1.fromCallback)(adapter.getFile),
         getJson: (0, universalify_1.fromCallback)(adapter.getJson),
         listSubDirectories: (0, universalify_1.fromCallback)(adapter.listSubDirectories),
-        putDir: (0, universalify_1.fromCallback)(adapter.putDir),
+        // Legacy callback adapters use their third argument for the callback and
+        // already own their directory privacy behaviour.
+        putDir: (folderPath, filePath) => putDir(folderPath, filePath),
         putFile: (0, universalify_1.fromCallback)(adapter.putFile),
         putFileContent: (0, universalify_1.fromCallback)(adapter.putFileContent),
         getUrl: adapter.getUrl,

package/dist/registry/router.js

@@ -9,6 +9,7 @@ const routes_1 = __importDefault(require("./routes"));
 const component_1 = __importDefault(require("./routes/component"));
 const component_info_1 = __importDefault(require("./routes/component-info"));
 const component_preview_1 = __importDefault(require("./routes/component-preview"));
+const component_static_1 = __importDefault(require("./routes/component-static"));
 const components_1 = __importDefault(require("./routes/components"));
 const dependencies_1 = __importDefault(require("./routes/dependencies"));
 const get_component_1 = __importDefault(require("./routes/helpers/get-component"));
@@ -25,6 +26,7 @@ function create(adapter, conf, repository) {
         components: (0, components_1.default)(conf, repository, renderComponent),
         componentInfo: (0, component_info_1.default)(conf, repository),
         componentPreview: (0, component_preview_1.default)(conf, repository),
+        componentStatic: (0, component_static_1.default)(repository),
         index: (0, routes_1.default)(repository),
         publish: (0, publish_1.default)(repository),
         staticRedirector: {
@@ -57,6 +59,7 @@ function create(adapter, conf, repository) {
         route('get', `${prefix}:componentName/:componentVersion/${settings_1.default.registry.localStaticRedirectorPath}*splat`, 'local-static', routes.staticRedirector.localStatic);
     }
     else {
+        route('get', `${prefix}:componentName/:componentVersion/${settings_1.default.registry.localStaticRedirectorPath}*splat`, 'component-static', routes.componentStatic);
         route('put', `${prefix}:componentName/:componentVersion`, 'publish', adapter.fromConnect(conf.beforePublish), routes.publish);
     }
     route('get', prefix, 'index', routes.index);

package/dist/registry/routes/component-static.d.ts

@@ -0,0 +1,3 @@
+import type { OcHandler } from '../domain/http-server/types';
+import type { Repository } from '../domain/repository';
+export default function componentStatic(repository: Repository): OcHandler;

package/dist/registry/routes/component-static.js

@@ -0,0 +1,79 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = componentStatic;
+const storage_adapter_1 = require("../domain/storage-adapter");
+const versionHandler = __importStar(require("../domain/version-handler"));
+function componentStatic(repository) {
+    return async (req, res) => {
+        const componentName = req.params['componentName'];
+        const requestedVersion = req.params['componentVersion'];
+        const filePath = req.params['splat'] ?? '';
+        if (!filePath ||
+            filePath.includes('\\') ||
+            filePath.split('/').includes('..')) {
+            res.status(404).json({ err: 'File not found' });
+            return;
+        }
+        if ((0, storage_adapter_1.isPrivateComponentFile)(`/${filePath}`)) {
+            res.status(404).json({ err: 'File not found' });
+            return;
+        }
+        let versions;
+        try {
+            versions = await repository.getComponentVersions(componentName);
+        }
+        catch {
+            res.status(404).json({
+                err: `Component "${componentName}" not found`
+            });
+            return;
+        }
+        if (!versions || versions.length === 0) {
+            res.status(404).json({
+                err: `Component "${componentName}" not found`
+            });
+            return;
+        }
+        const resolvedVersion = versionHandler.getAvailableVersion(requestedVersion, versions);
+        if (!resolvedVersion) {
+            res.status(404).json({
+                err: `Component "${componentName}" with version "${requestedVersion}" not found`
+            });
+            return;
+        }
+        res.redirect(repository.getStaticFilePath(componentName, resolvedVersion, filePath));
+    };
+}

package/dist/registry/routes/helpers/component-parameter-processor.d.ts

@@ -0,0 +1,22 @@
+import type { OcParameter } from '../../../types';
+export interface ValidationResult {
+    isValid: boolean;
+    errors: {
+        mandatory: Record<string, string>;
+        types: Record<string, string>;
+        message: string;
+    };
+}
+export interface CompiledParameterSchema {
+    isEmpty: boolean;
+    defaults: Array<[string, string | number | boolean]>;
+    mandatory: string[];
+    types: Record<string, string>;
+    coercions: Record<string, 'boolean' | 'number' | 'string'>;
+    enums: Record<string, ReadonlyArray<string | number | boolean>>;
+}
+export declare function compileParameterSchema(expectedParameters?: Record<string, OcParameter> | null): CompiledParameterSchema;
+export declare function processParameters(requestParameters: Record<string, string | number | boolean> | null | undefined, compiled: CompiledParameterSchema): {
+    params: Record<string, string | number | boolean>;
+    validation: ValidationResult;
+};

package/dist/registry/routes/helpers/component-parameter-processor.js

@@ -0,0 +1,228 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileParameterSchema = compileParameterSchema;
+exports.processParameters = processParameters;
+const resources_1 = __importDefault(require("../../../resources"));
+const emptyCompiledSchema = {
+    isEmpty: true,
+    defaults: [],
+    mandatory: [],
+    types: Object.create(null),
+    coercions: Object.create(null),
+    enums: Object.create(null)
+};
+function compileParameterSchema(expectedParameters) {
+    if (!expectedParameters ||
+        typeof expectedParameters !== 'object' ||
+        Array.isArray(expectedParameters)) {
+        return emptyCompiledSchema;
+    }
+    const keys = Object.keys(expectedParameters);
+    if (keys.length === 0) {
+        return emptyCompiledSchema;
+    }
+    const defaults = [];
+    const mandatory = [];
+    const types = Object.create(null);
+    const coercions = Object.create(null);
+    const enums = Object.create(null);
+    for (const name in expectedParameters) {
+        if (!Object.hasOwn(expectedParameters, name)) {
+            continue;
+        }
+        const param = expectedParameters[name];
+        if (!param || typeof param !== 'object') {
+            throw new TypeError(`Invalid parameter schema for "${name}"`);
+        }
+        const rawType = param.type;
+        const normalizedType = typeof rawType === 'string' ? rawType.toLowerCase() : '';
+        types[name] = normalizedType;
+        if (rawType === 'boolean' || rawType === 'number' || rawType === 'string') {
+            coercions[name] = rawType;
+        }
+        const enumValues = param.enum;
+        if (typeof enumValues !== 'undefined') {
+            enums[name] = enumValues;
+        }
+        if (param.mandatory) {
+            mandatory.push(name);
+        }
+        else if (typeof param.default !== 'undefined') {
+            defaults.push([name, param.default]);
+        }
+    }
+    return {
+        isEmpty: false,
+        defaults,
+        mandatory,
+        types,
+        coercions,
+        enums
+    };
+}
+function processParameters(requestParameters, compiled) {
+    if (compiled.isEmpty) {
+        const source = requestParameters;
+        if (!source || typeof source !== 'object') {
+            return {
+                params: {},
+                validation: {
+                    isValid: true,
+                    errors: { mandatory: {}, types: {}, message: '' }
+                }
+            };
+        }
+        const params = {};
+        for (const key in source) {
+            if (!Object.hasOwn(source, key)) {
+                continue;
+            }
+            if (key === '__ocAcceptLanguage') {
+                continue;
+            }
+            params[key] = source[key];
+        }
+        return {
+            params,
+            validation: {
+                isValid: true,
+                errors: { mandatory: {}, types: {}, message: '' }
+            }
+        };
+    }
+    let source;
+    if (requestParameters == null || typeof requestParameters !== 'object') {
+        source = {};
+    }
+    else {
+        source = requestParameters;
+    }
+    const defaults = compiled.defaults;
+    for (let i = 0; i < defaults.length; i++) {
+        const entry = defaults[i];
+        const key = entry[0];
+        const defVal = entry[1];
+        const cur = source[key];
+        if (cur === null || cur === undefined) {
+            source[key] = defVal;
+        }
+    }
+    const params = {};
+    let mandatoryErrors = null;
+    let typeErrors = null;
+    let isValid = true;
+    const types = compiled.types;
+    const coercions = compiled.coercions;
+    const enums = compiled.enums;
+    for (const key in source) {
+        if (!Object.hasOwn(source, key)) {
+            continue;
+        }
+        const isDeclared = Object.hasOwn(types, key);
+        if (isDeclared) {
+            const rawVal = source[key];
+            const type = types[key];
+            const coercion = coercions[key];
+            let sanitised;
+            if (coercion === 'boolean') {
+                if (typeof rawVal === 'string') {
+                    if (rawVal === 'true') {
+                        sanitised = true;
+                    }
+                    else if (rawVal === 'false') {
+                        sanitised = false;
+                    }
+                    else {
+                        sanitised = rawVal;
+                    }
+                }
+                else {
+                    sanitised = rawVal;
+                }
+            }
+            else if (coercion === 'number') {
+                sanitised = Number(rawVal);
+            }
+            else if (coercion === 'string') {
+                sanitised = rawVal == null ? '' : rawVal;
+            }
+            else {
+                sanitised = rawVal;
+            }
+            params[key] = sanitised;
+            let typeValid;
+            if (type === 'boolean') {
+                typeValid = typeof sanitised === 'boolean';
+            }
+            else if (type === 'number') {
+                typeValid = typeof sanitised === 'number';
+            }
+            else if (type === 'string') {
+                typeValid = typeof sanitised === 'string';
+            }
+            else {
+                typeValid = false;
+            }
+            if (!typeValid) {
+                isValid = false;
+                if (!typeErrors) {
+                    typeErrors = {};
+                }
+                typeErrors[key] = resources_1.default.errors.registry.PARAMETER_WRONG_FORMAT_CODE;
+                continue;
+            }
+            const enumVals = enums[key];
+            if (enumVals && !enumVals.includes(sanitised)) {
+                isValid = false;
+                if (!typeErrors) {
+                    typeErrors = {};
+                }
+                typeErrors[key] = resources_1.default.errors.registry.PARAMETER_WRONG_VALUE(key, enumVals);
+            }
+        }
+        else {
+            if (key === '__ocAcceptLanguage') {
+                continue;
+            }
+            params[key] = source[key];
+        }
+    }
+    const mandatory = compiled.mandatory;
+    for (let i = 0; i < mandatory.length; i++) {
+        const name = mandatory[i];
+        if (!(name in params)) {
+            isValid = false;
+            if (!mandatoryErrors) {
+                mandatoryErrors = {};
+            }
+            mandatoryErrors[name] =
+                resources_1.default.errors.registry.MANDATORY_PARAMETER_MISSING_CODE;
+        }
+    }
+    let message = '';
+    if (mandatoryErrors) {
+        const keys = Object.keys(mandatoryErrors);
+        const joined = keys.join(', ');
+        message += resources_1.default.errors.registry.MANDATORY_PARAMETER_MISSING(joined);
+    }
+    if (typeErrors) {
+        if (message.length > 0) {
+            message += '; ';
+        }
+        const keys = Object.keys(typeErrors);
+        const joined = keys.join(', ');
+        message += resources_1.default.errors.registry.PARAMETER_WRONG_FORMAT(joined);
+    }
+    const validation = {
+        isValid,
+        errors: {
+            mandatory: mandatoryErrors || {},
+            types: typeErrors || {},
+            message
+        }
+    };
+    return { params, validation };
+}

package/dist/registry/routes/helpers/get-component.d.ts

@@ -34,6 +34,7 @@ export interface GetComponentResult {
             message: string;
             stack: string;
             originalError: unknown;
+            frame?: string;
         };
         missingPlugins?: string[];
         missingDependencies?: string[];