@opra/cli 1.21.0 → 1.22.1

package/cjs/ts-generator/generators/generate-document.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDocument = generateDocument;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const client_1 = require("@opra/client");
-const common_1 = require("@opra/common");
-const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
-const putil_varhelpers_1 = require("putil-varhelpers");
-async function generateDocument(document, options) {
-    if (!document || typeof document === 'string') {
-        if (document) {
-            const out = this._documentsMap.get(document);
-            if (out)
-                return out;
-        }
-        this.emit('log', ansi_colors_1.default.cyan('Fetching document schema from ') +
-            ansi_colors_1.default.blueBright(this.serviceUrl));
-        const client = new client_1.OpraHttpClient(this.serviceUrl);
-        document = await client.fetchDocument({ documentId: document });
-    }
-    this._document = document;
-    let out = this._documentsMap.get(document.id);
-    if (out)
-        return out;
-    out = {
-        document,
-        generator: this,
-    };
-    this._documentsMap.set(document.id, out);
-    this.emit('log', ansi_colors_1.default.white('[' + document.id + '] ') +
-        ansi_colors_1.default.cyan('Processing document ') +
-        ansi_colors_1.default.magenta(document.info.title || ''));
-    if (document.references.size) {
-        let refIdGenerator = options?.refIdGenerator || 1;
-        this.emit('log', ansi_colors_1.default.white('[' + document.id + '] ') +
-            ansi_colors_1.default.cyan(`Processing references`));
-        for (const ref of document.references.values()) {
-            const generator = this.extend();
-            generator._document = ref;
-            const typesNamespace = ref.api?.name ||
-                (ref.info.title
-                    ? (0, putil_varhelpers_1.pascalCase)(ref.info.title)
-                    : `Reference${refIdGenerator++}`);
-            generator._documentRoot = '/references/' + typesNamespace;
-            generator._typesRoot = node_path_1.default.posix.join(generator._documentRoot, 'models');
-            generator._typesNamespace =
-                !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
-            await generator.generateDocument(ref, {
-                typesOnly: true,
-                refIdGenerator,
-            });
-        }
-    }
-    this._fileHeaderDocInfo = `/*
- * ${document.info.title}
- * Id: ${document.id}
- * Version: ${document.info.version}
- * ${this.serviceUrl}
- */`;
-    if (document.types.size) {
-        this.emit('log', ansi_colors_1.default.white('[' + document.id + ']'), ansi_colors_1.default.cyan(`Processing data types`));
-        for (const t of document.types.values()) {
-            await this.generateDataType(t, 'root');
-        }
-    }
-    if (options?.typesOnly)
-        return out;
-    if (document.api instanceof common_1.HttpApi) {
-        await this.generateHttpApi(document.api);
-    }
-    return out;
-}

package/cjs/ts-generator/generators/generate-http-api.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHttpApi = generateHttpApi;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const putil_varhelpers_1 = require("putil-varhelpers");
-const code_block_js_1 = require("../../code-block.js");
-const http_controller_node_js_1 = require("../http-controller-node.js");
-const string_utils_js_1 = require("../utils/string-utils.js");
-async function generateHttpApi(api) {
-    let file = this._filesMap.get(api);
-    if (file)
-        return file;
-    const className = api.name ? (0, putil_varhelpers_1.pascalCase)(api.name) : 'Api';
-    file = this.addFile(className + '.ts');
-    file.addImport('@opra/client', ['kClient', 'OpraHttpClient']);
-    const indexTs = this.addFile('/index.ts', true);
-    indexTs.addExport('.' + file.filename);
-    const httpApiNodeFile = this.addFile('./http-controller-node.ts');
-    httpApiNodeFile.code.content = http_controller_node_js_1.httpControllerNodeScript;
-    const classBlock = (file.code[className] = new code_block_js_1.CodeBlock());
-    classBlock.doc = `/** 
- * ${(0, string_utils_js_1.wrapJSDocString)(api.description || '')}
- * @class ${className}
- * @url ${node_path_1.default.posix.join(this.serviceUrl, '$schema')}
- */`;
-    classBlock.head = `\nexport class ${className} {\n\t`;
-    classBlock.properties = 'readonly [kClient]: OpraHttpClient;';
-    const classConstBlock = (classBlock.classConstBlock = new code_block_js_1.CodeBlock());
-    classConstBlock.head = `\n\nconstructor(client: OpraHttpClient) {`;
-    classConstBlock.body = `\n\tthis[kClient] = client;`;
-    classConstBlock.tail = `\b\n}\n`;
-    for (const controller of api.controllers.values()) {
-        const generator = this.extend();
-        const f = await generator.generateHttpController(controller);
-        const childClassName = (0, putil_varhelpers_1.pascalCase)(controller.name) + 'Controller';
-        file.addImport('.' + f.filename, [childClassName]);
-        const property = '$' +
-            controller.name.charAt(0).toLowerCase() +
-            (0, putil_varhelpers_1.camelCase)(controller.name.substring(1));
-        classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
-        classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
-    }
-    classBlock.tail = `\b}`;
-    return file;
-}

package/cjs/ts-generator/generators/generate-http-controller.js

@@ -1,314 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHttpController = generateHttpController;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
-const common_1 = require("@opra/common");
-const putil_varhelpers_1 = require("putil-varhelpers");
-const code_block_js_1 = require("../../code-block.js");
-const locate_named_type_js_1 = require("../utils/locate-named-type.js");
-const string_utils_js_1 = require("../utils/string-utils.js");
-async function generateHttpController(controller) {
-    let file = this._filesMap.get(controller);
-    if (file)
-        return file;
-    const generateParamDoc = async (name, type, options) => {
-        let typeDef;
-        if (type) {
-            const xt = await this.generateDataType(type, 'typeDef', file);
-            typeDef = xt.kind === 'embedded' ? 'object' : xt.typeName;
-        }
-        else
-            typeDef = 'any';
-        if (options?.isArray)
-            typeDef += '[]';
-        let out = `\n * @param {${typeDef}} ` + (options?.required ? name : `[${name}]`);
-        if (options?.description)
-            out += `  - ${(0, string_utils_js_1.wrapJSDocString)(options?.description)}`;
-        if (type instanceof common_1.ComplexType && type.embedded) {
-            for (const f of type.fields('*')) {
-                out += await generateParamDoc(name + '.' + f.name, f.type, f);
-            }
-        }
-        return out;
-    };
-    const className = (0, putil_varhelpers_1.pascalCase)(controller.name) + 'Controller';
-    file = this.addFile(node_path_1.default.join(this._apiPath, className + '.ts'));
-    file.addImport('@opra/client', [
-        'HttpRequestObservable',
-        'kClient',
-        'OpraHttpClient',
-    ]);
-    file.addImport(node_path_1.default.relative(file.dirname, '/http-controller-node.ts'), [
-        'HttpControllerNode',
-    ]);
-    const classBlock = (file.code[className] = new code_block_js_1.CodeBlock());
-    classBlock.doc = `/** 
- * ${(0, string_utils_js_1.wrapJSDocString)(controller.description || '')}
- * @class ${className}
- * @apiUrl ${node_path_1.default.posix.join(this.serviceUrl, controller.getFullUrl())}
- */`;
-    classBlock.head = `\nexport class ${className} extends HttpControllerNode {\n\t`;
-    classBlock.properties = '';
-    const classConstBlock = (classBlock.classConstBlock = new code_block_js_1.CodeBlock());
-    classConstBlock.head = `\n/**
- * @param {OpraHttpClient} client - OpraHttpClient instance to operate
- * @constructor
- */  
-constructor(client: OpraHttpClient) {`;
-    classConstBlock.body = `\n\tsuper(client);`;
-    classConstBlock.tail = `\b\n}\n`;
-    if (controller.controllers.size) {
-        for (const child of controller.controllers.values()) {
-            const generator = this.extend();
-            generator._apiPath = node_path_1.default.join(this._apiPath, className);
-            const f = await generator.generateHttpController(child);
-            const childClassName = (0, putil_varhelpers_1.pascalCase)(child.name) + 'Controller';
-            file.addImport(f.filename, [childClassName]);
-            const property = '$' +
-                child.name.charAt(0).toLowerCase() +
-                (0, putil_varhelpers_1.camelCase)(child.name.substring(1));
-            classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
-            classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
-        }
-    }
-    /** Process operations */
-    const mergedControllerParams = [...controller.parameters];
-    let _base = controller;
-    while (_base.owner instanceof common_1.HttpController) {
-        _base = _base.owner;
-        mergedControllerParams.unshift(..._base.parameters);
-    }
-    for (const operation of controller.operations.values()) {
-        const mergedParams = [...mergedControllerParams, ...operation.parameters];
-        const operationBlock = (classBlock['operation_' + operation.name] =
-            new code_block_js_1.CodeBlock());
-        operationBlock.doc = new code_block_js_1.CodeBlock();
-        operationBlock.doc.header = `
-/** 
- * ${(0, string_utils_js_1.wrapJSDocString)(operation.description || operation.name + ' operation')}`;
-        operationBlock.doc.parameters = new code_block_js_1.CodeBlock();
-        if (mergedParams.length) {
-            const block = new code_block_js_1.CodeBlock();
-            block.doc = '\n *\n * RegExp parameters:';
-            let i = 0;
-            for (const prm of operation.parameters) {
-                if (!(prm.name instanceof RegExp))
-                    continue;
-                i++;
-                block.doc +=
-                    `\n *   > ${String(prm.name)} - ${prm.description || ''}` +
-                        `\n *       - location: ${prm.location}` +
-                        `\n *       - type: ${(0, locate_named_type_js_1.locateNamedType)(prm.type)?.name || 'any'}${prm.isArray ? '[' + prm.arraySeparator + ']' : ''}` +
-                        (prm.required ? `\n *      required: ${prm.required}` : '') +
-                        (prm.deprecated ? `\n *      deprecated: ${prm.deprecated}` : '');
-            }
-            if (i)
-                operationBlock.doc.regExParameters = block;
-        }
-        operationBlock.doc.tail = `
- * @apiUrl ${node_path_1.default.posix.join(this.serviceUrl, operation.getFullUrl())}    
- */\n`;
-        operationBlock.head = `${operation.name}(`;
-        /** Process operation parameters */
-        const pathParams = [];
-        const queryParams = [];
-        const headerParams = [];
-        if (mergedParams.length) {
-            const pathParamsMap = {};
-            const queryParamsMap = {};
-            const headerParamsMap = {};
-            for (const prm of mergedParams) {
-                if (typeof prm.name !== 'string')
-                    continue;
-                if (prm.location === 'path')
-                    pathParamsMap[prm.name] = prm;
-                if (prm.location === 'query')
-                    queryParamsMap[prm.name] = prm;
-                if (prm.location === 'header')
-                    headerParamsMap[prm.name] = prm;
-            }
-            pathParams.push(...Object.values(pathParamsMap));
-            queryParams.push(...Object.values(queryParamsMap));
-            headerParams.push(...Object.values(headerParamsMap));
-        }
-        /** Process path parameters and add as function arguments */
-        let argIndex = 0;
-        for (const prm of pathParams) {
-            let typeDef;
-            if (prm.type) {
-                const xt = await this.generateDataType(prm.type, 'typeDef', file);
-                typeDef = xt.kind === 'embedded' ? xt.code : xt.typeName;
-            }
-            else
-                typeDef = `any`;
-            if (prm.isArray)
-                typeDef += '[]';
-            if (argIndex++ > 0)
-                operationBlock.head += ', ';
-            operationBlock.head += `${prm.name}: ${typeDef}`;
-            operationBlock.doc.parameters +=
-                `\n * @param {${typeDef}} ` +
-                    (prm.required ? prm.name : `[${prm.name}]`) +
-                    (prm.description ? ' - ' + (0, string_utils_js_1.wrapJSDocString)(prm.description || '') : '');
-        }
-        /** Process requestBody and add as function argument ($body) */
-        let hasBody = false;
-        if (operation.requestBody?.content.length) {
-            if (argIndex++ > 0)
-                operationBlock.head += ', ';
-            let typeArr = [];
-            for (const content of operation.requestBody.content) {
-                if (content.type) {
-                    /** Generate JSDoc for parameter */
-                    operationBlock.doc.parameters += await generateParamDoc('$body', content.type, {
-                        required: operation.requestBody.required,
-                        description: content.description || content.type.description,
-                    });
-                    /**  */
-                    const xt = await this.generateDataType(content.type, 'typeDef', file);
-                    let typeDef = xt.kind === 'embedded' ? xt.code : xt.typeName;
-                    if (typeDef === 'any') {
-                        typeArr = [];
-                        break;
-                    }
-                    if (xt.kind === 'named') {
-                        if (operation.requestBody.partial) {
-                            file.addImport('ts-gems', ['PartialDTO']);
-                            typeDef = `PartialDTO<${typeDef}>`;
-                        }
-                        else {
-                            file.addImport('ts-gems', ['DTO']);
-                            typeDef = `DTO<${typeDef}>`;
-                        }
-                    }
-                    if (typeDef && content.isArray)
-                        typeDef += '[]';
-                    typeDef = typeDef || 'undefined';
-                    if (!typeArr.includes(typeDef))
-                        typeArr.push(typeDef);
-                    continue;
-                }
-                else if (content.contentType &&
-                    type_is_1.default.is(String(content.contentType), ['multipart/*'])) {
-                    const typeDef = 'FormData';
-                    if (!typeArr.includes(typeDef))
-                        typeArr.push(typeDef);
-                    continue;
-                }
-                typeArr = [];
-                break;
-            }
-            const typeDef = typeArr.join(' | ') || 'any';
-            operationBlock.head += `$body: ${typeDef}`;
-            // operationBlock.doc.parameters += `\n * @param {${typeDef}} $body - Http body` + bodyFields;
-            hasBody = true;
-        }
-        /** process query params */
-        const isQueryRequired = queryParams.find(p => p.required);
-        const isHeadersRequired = queryParams.find(p => p.required);
-        if (queryParams.length) {
-            if (argIndex++ > 0)
-                operationBlock.head += ', ';
-            operationBlock.head +=
-                '\n\t$params' +
-                    (isHeadersRequired || isQueryRequired ? '' : '?') +
-                    ': {\n\t';
-            operationBlock.doc.parameters +=
-                '\n * @param {object} $params - Available parameters for the operation';
-            let hasAdditionalFields = false;
-            for (const prm of queryParams) {
-                if (typeof prm.name !== 'string') {
-                    hasAdditionalFields = true;
-                    continue;
-                }
-                operationBlock.doc.parameters += await generateParamDoc('$params.' + prm.name, prm.type, prm);
-                operationBlock.head += `${prm.name}${prm.required ? '' : '?'}: `;
-                if (prm.type) {
-                    const xt = await this.generateDataType(prm.type, 'typeDef', file);
-                    let typeDef = xt.kind === 'embedded' ? xt.code : xt.typeName;
-                    if (prm.isArray)
-                        typeDef += '[]';
-                    operationBlock.head += `${typeDef};\n`;
-                }
-                else
-                    operationBlock.head += `any;\n`;
-            }
-            if (hasAdditionalFields) {
-                operationBlock.head += '[index: string]: any;\n';
-            }
-            operationBlock.head += '\b}\b';
-        }
-        /** process header params */
-        if (headerParams.length) {
-            if (argIndex++ > 0)
-                operationBlock.head += ', \n';
-            operationBlock.head +=
-                '\t$headers' + (isHeadersRequired ? '' : '?') + ': {\n\t';
-            for (const prm of headerParams) {
-                operationBlock.head += `/**\n * ${prm.description || ''}\n */\n`;
-                operationBlock.head += `${prm.name}${prm.required ? '' : '?'}: `;
-                if (prm.type) {
-                    const xt = await this.generateDataType(prm.type, 'typeDef', file);
-                    let typeDef = xt.kind === 'embedded' ? xt.code : xt.typeName;
-                    if (prm.isArray)
-                        typeDef += '[]';
-                    operationBlock.head += `${typeDef};\n`;
-                }
-                else
-                    operationBlock.head += `any;\n`;
-            }
-            operationBlock.head += '\b}\b';
-        }
-        /* Determine return type */
-        const returnTypes = [];
-        let typeDef = '';
-        for (const resp of operation.responses) {
-            if (!resp.statusCode.find(r => r.intersects(200, 299)))
-                continue;
-            typeDef = '';
-            if (resp.type) {
-                const xt = await this.generateDataType(resp.type, 'typeDef', file);
-                typeDef = xt.kind === 'embedded' ? xt.code : xt.typeName;
-            }
-            if (typeDef) {
-                if (typeDef !== 'OperationResult') {
-                    if (resp.partial) {
-                        file.addImport('ts-gems', ['PartialDTO']);
-                        typeDef = `PartialDTO<${typeDef}>`;
-                    }
-                    else {
-                        file.addImport('ts-gems', ['DTO']);
-                        typeDef = `DTO<${typeDef}>`;
-                    }
-                }
-            }
-            if (typeDef && resp.isArray)
-                typeDef += '[]';
-            if (resp.contentType &&
-                type_is_1.default.is(String(resp.contentType), [common_1.MimeTypes.opra_response_json])) {
-                file.addImport('@opra/common', ['OperationResult']);
-                typeDef = typeDef ? `OperationResult<${typeDef}>` : 'OperationResult';
-            }
-            typeDef = typeDef || 'undefined';
-            if (!returnTypes.includes(typeDef))
-                returnTypes.push(typeDef);
-        }
-        operationBlock.head += `\n): HttpRequestObservable<${returnTypes.join(' | ') || 'any'}>{`;
-        operationBlock.body = `\n\t`;
-        operationBlock.body +=
-            `const url = this._prepareUrl('${operation.getFullUrl()}', {` +
-                pathParams.map(p => p.name).join(', ') +
-                '});';
-        operationBlock.body +=
-            `\nreturn this[kClient].request(url, { method: '${operation.method}'` +
-                (hasBody ? ', body: $body' : '') +
-                (queryParams.length ? ', params: $params as any' : '') +
-                (headerParams.length ? ', headers: $headers as any' : '') +
-                '});';
-        operationBlock.tail = `\b\n};\n`;
-    }
-    classBlock.tail = `\b}`;
-    return file;
-}

package/cjs/ts-generator/http-controller-node.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpControllerNodeScript = void 0;
-exports.httpControllerNodeScript = `import { kClient, OpraHttpClient } from '@opra/client';
-
-const PARAM_PATTERN = /:\\w+/g;
-
-export class HttpControllerNode {
-  readonly [kClient]: OpraHttpClient;
-
-  constructor(client: OpraHttpClient) {
-    this[kClient] = client;
-  }
-  
-  protected _prepareUrl(url: string, params: Record<string, any>): string {
-    return url.replace(PARAM_PATTERN, s => {
-      return params[s.substring(1)] || '';
-    });
-  }
-}
-`;

package/cjs/ts-generator/index.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./ts-generator.js"), exports);

package/cjs/ts-generator/ts-file.js

@@ -1,114 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TsFile = void 0;
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const putil_flattentext_1 = tslib_1.__importDefault(require("putil-flattentext"));
-const code_block_js_1 = require("../code-block.js");
-class TsFile {
-    constructor(filename) {
-        this.filename = filename;
-        this.imports = {};
-        this.exportFiles = {};
-        this.exportTypes = [];
-        this.code = new code_block_js_1.CodeBlock();
-        this.dirname = node_path_1.default.dirname(filename);
-        this.code.header = '';
-        this.code.imports = '';
-        this.code.exports = '';
-    }
-    addImport(filename, items, typeImport) {
-        if (isLocalFile(filename)) {
-            filename = node_path_1.default.relative(this.dirname, node_path_1.default.resolve(this.dirname, filename));
-            if (!filename.startsWith('.'))
-                filename = './' + filename;
-        }
-        if (filename.endsWith('.d.ts'))
-            filename = filename.substring(0, filename.length - 5);
-        if (filename.endsWith('.ts') || filename.endsWith('.js'))
-            filename = filename.substring(0, filename.length - 3);
-        const imp = (this.imports[filename] = this.imports[filename] || {
-            items: [],
-            typeImport,
-        });
-        if (!typeImport)
-            imp.typeImport = false;
-        items?.forEach(x => {
-            if (!imp.items.includes(x))
-                imp.items.push(x);
-        });
-    }
-    addExport(filename, types, namespace) {
-        if (isLocalFile(filename)) {
-            filename = node_path_1.default.relative(this.dirname, node_path_1.default.resolve(this.dirname, filename));
-            if (!filename.startsWith('.'))
-                filename = './' + filename;
-        }
-        if (filename.endsWith('.d.ts'))
-            filename = filename.substring(0, filename.length - 5);
-        if (filename.endsWith('.ts') || filename.endsWith('.js'))
-            filename = filename.substring(0, filename.length - 3);
-        const key = (namespace ? namespace + ':' : '') + filename;
-        this.exportFiles[key] = this.exportFiles[key] || {
-            filename,
-            items: [],
-            namespace,
-        };
-        types?.forEach(x => {
-            if (!this.exportFiles[filename].items.includes(x))
-                this.exportFiles[filename].items.push(x);
-        });
-    }
-    generate(options) {
-        this.code.imports = Object.keys(this.imports)
-            .sort((a, b) => {
-            if (a.startsWith('@'))
-                return -1;
-            if (b.startsWith('@'))
-                return 1;
-            if (!a.startsWith('.'))
-                return -1;
-            if (!b.startsWith('.'))
-                return 1;
-            return a.toLowerCase().localeCompare(b.toLowerCase());
-        })
-            .map(filename => {
-            const imp = this.imports[filename];
-            let relFile = filename;
-            if (!isPackageName(filename)) {
-                if (options?.importExt)
-                    relFile += '.js';
-            }
-            return `import${imp.typeImport ? ' type' : ''} ${imp.items.length ? '{ ' + imp.items.join(', ') + ' } from ' : ''}'${relFile}';`;
-        })
-            .join('\n');
-        this.code.exports = Object.keys(this.exportFiles)
-            .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-            .map(key => {
-            const exportFile = this.exportFiles[key];
-            const types = exportFile.items;
-            let filename = exportFile.filename;
-            if (!isPackageName(filename)) {
-                if (options?.importExt)
-                    filename += '.js';
-            }
-            let out = `export ${types.length ? '{ ' + types.join(', ') + ' }' : '*'}`;
-            if (exportFile.namespace)
-                out += ` as ${exportFile.namespace}`;
-            return out + ` from '${filename}';`;
-        })
-            .join('\n');
-        if (this.code.imports || this.code.exports)
-            this.code.exports += '\n\n';
-        return ('/* #!oprimp_auto_generated!# !! Do NOT remove this line */\n/* eslint-disable */\n// noinspection SpellCheckingInspection\n\n' +
-            (0, putil_flattentext_1.default)(String(this.code)));
-    }
-}
-exports.TsFile = TsFile;
-function isLocalFile(s) {
-    return typeof s === 'string' && (s.startsWith('.') || s.startsWith('/'));
-}
-const PACKAGENAME_PATTERN = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
-function isPackageName(s) {
-    return PACKAGENAME_PATTERN.test(s);
-}