@cabloy/utils 1.0.12 → 1.0.14

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export * from './cel.ts';
 export * from './check.ts';
 export * from './utils.ts';
+export * from './vona.ts';

package/dist/index.js

@@ -1,3 +1,4 @@
 export * from "./cel.js";
 export * from "./check.js";
 export * from "./utils.js";
+export * from "./vona.js";

package/dist/utils.d.ts

@@ -3,8 +3,8 @@ export declare function catchError<T>(fnMethod: (...args: any[]) => Promise<T>):
 export declare function sleep(ms: any): Promise<unknown>;
 export declare function replaceTemplate(content: string, scope: object): string;
 export declare function setProperty<T>(obj: object, name: string, value: T): void;
-export declare function getProperty<T>(obj: object, name: string, sep?: string): T | undefined;
-export declare function getPropertyObject<T>(obj: object, name: string, sep?: string): T | undefined;
+export declare function getProperty<T>(obj: object | undefined, name: string, sep?: string): T | undefined;
+export declare function getPropertyObject<T>(obj: object | undefined, name: string, sep?: string): T | undefined;
 export declare function createFunction(expression: string, scopeKeys?: string[]): Function;
 export declare function evaluateSimple(expression: string, scope?: object): any;
 export declare function getRandomInt(size: number, start?: number): number;

package/dist/utils.js

@@ -53,9 +53,10 @@ export function getProperty(obj, name, sep) {
 export function getPropertyObject(obj, name, sep) {
     return _getProperty(obj, name, sep, true);
 }
-function _getProperty(obj, name, sep, forceObject) {
-    if (!obj)
+function _getProperty(_obj, name, sep, forceObject) {
+    if (!_obj)
         return undefined;
+    let obj = _obj;
     const names = name.split(sep || '.');
     // loop
     for (const name of names) {

package/dist/vona.d.ts

@@ -0,0 +1,6 @@
+import type * as ModuleInfo from '@cabloy/module-info';
+export declare function combineResourceNameParts(resourceName: string | undefined, moduleName: ModuleInfo.IModuleInfo | string, simplify?: boolean, simplifyProviderId?: boolean): string[];
+export declare function combineResourceName(resourceName: string | undefined, moduleName: ModuleInfo.IModuleInfo | string, simplify?: boolean, simplifyProviderId?: boolean): string;
+export declare function combineApiPath(path: string | undefined, moduleName?: ModuleInfo.IModuleInfo | string, prefix?: string | boolean, simplify?: boolean, globalPrefixConfig?: string): string;
+export declare function combineApiPathControllerAndAction(moduleName: ModuleInfo.IModuleInfo | string, controllerPath: string | undefined, actionPath: RegExp | string | undefined, prefix?: string | boolean, simplify?: boolean, globalPrefixConfig?: string): string;
+export declare function combineApiPathControllerAndActionRaw(moduleName: ModuleInfo.IModuleInfo | string, controllerPath: string | undefined, actionPath: RegExp | string | undefined, simplify?: boolean): string;

package/dist/vona.js

@@ -0,0 +1,78 @@
+import { stringToCapitalize, toLowerCaseFirstChar } from '@cabloy/word-utils';
+export function combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId) {
+    simplify = simplify ?? true;
+    simplifyProviderId = simplifyProviderId ?? true;
+    if (!resourceName)
+        resourceName = '';
+    // module path + arg
+    if (typeof moduleName !== 'string')
+        moduleName = moduleName.relativeName;
+    const parts = moduleName.split('-');
+    // path
+    const res = [];
+    if (!simplifyProviderId || parts[0] !== 'a')
+        res.push(parts[0]);
+    if (!simplify || !resourceName.startsWith(parts[1]))
+        res.push(parts[1]);
+    if (resourceName)
+        res.push(resourceName);
+    return res;
+}
+export function combineResourceName(resourceName, moduleName, simplify, simplifyProviderId) {
+    const parts = combineResourceNameParts(resourceName, moduleName, simplify, simplifyProviderId);
+    return toLowerCaseFirstChar(stringToCapitalize(parts));
+}
+export function combineApiPath(path, moduleName, prefix, simplify, globalPrefixConfig) {
+    const globalPrefix = typeof prefix === 'string' ? prefix : prefix === false ? '' : globalPrefixConfig;
+    simplify = simplify ?? true;
+    if (!path)
+        path = '';
+    // ignore globalPrefix
+    if (path.startsWith('//'))
+        return path.substring(1);
+    // ignore module path
+    if (path.startsWith('/'))
+        return `${globalPrefix}${path}`;
+    // globalPrefix + module path + arg
+    const parts = combineResourceNameParts(path, moduleName ?? '', simplify, true);
+    return `${globalPrefix}/${parts.join('/')}`;
+}
+export function combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, prefix, simplify, globalPrefixConfig) {
+    if (actionPath === undefined)
+        actionPath = '';
+    // routePath
+    let routePath;
+    if (typeof actionPath !== 'string') {
+        // regexp
+        throw new TypeError('regexp not supported');
+    }
+    else if (actionPath.startsWith('/')) {
+        // absolute
+        routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
+    }
+    else {
+        // relative
+        if (!controllerPath) {
+            routePath = combineApiPath(actionPath, moduleName, prefix, simplify, globalPrefixConfig);
+        }
+        else {
+            routePath = combineApiPath(controllerPath, moduleName, prefix, simplify, globalPrefixConfig);
+            if (actionPath) {
+                routePath = `${routePath}/${actionPath}`;
+            }
+        }
+    }
+    return routePath;
+}
+export function combineApiPathControllerAndActionRaw(moduleName, controllerPath, actionPath, simplify) {
+    let apiPath = combineApiPathControllerAndAction(moduleName, controllerPath, actionPath, '/_api_', simplify);
+    if (typeof apiPath !== 'string')
+        return apiPath;
+    if (apiPath.startsWith('/_api_')) {
+        apiPath = apiPath.substring('/_api_'.length);
+    }
+    else {
+        apiPath = `/${apiPath}`;
+    }
+    return apiPath;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cabloy/utils",
   "type": "module",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "cabloy utils",
   "publishConfig": {
     "access": "public"
@@ -25,6 +25,8 @@
     "dist"
   ],
   "dependencies": {
-    "cel-js": "^0.3.1"
+    "@cabloy/word-utils": "^2.0.0",
+    "cel-js": "^0.3.1",
+    "@cabloy/module-info": "^1.3.6"
   }
 }