@adminide-stack/core 10.0.2-alpha.4 → 10.0.6-alpha.0

package/lib/interfaces/configuration/configuration.d.ts

@@ -1,6 +1,5 @@
 import { ConfigurationScope } from '@workbench-stack/core/lib/interfaces/configuration/configuration.js';
 import { IConfigurationDefaults, IConfigurationExtensionInfo, IConfigurationNode, IPreferences, IResolveConfigurationQuery } from 'common/lib/generated/generated-models.js';
-import { FlattenWithFinite } from '../utils';
 export { ConfigurationScope };
 export declare const USER_SCOPES: ConfigurationScope[];
 export declare const LOCAL_MACHINE_SCOPES: ConfigurationScope[];
@@ -68,11 +67,6 @@ export interface IConfigurationChange {
     keys: string[];
     overrides: [string, string[]][];
 }
-export type IConfigurationsFlattenedKeys = FlattenWithFinite<IPreferences, 10, ''>;
-export type FlattenWithAll<T, Prefix extends string = '', Depth extends number = 3> = [Depth] extends [never] ? never : {
-    [K in keyof T & (string | number)]: T[K] extends object ? `${Prefix}${K}` | FlattenWithFinite<T[K], 10, Depth extends 1 ? never : Depth extends 3 ? '2' : '1'> : `${Prefix}${K}`;
-}[keyof T & (string | number)];
-export type IConfigurationKeys = FlattenWithAll<IPreferences, '', 10>;
 export interface IConfigurationDelta {
     removedDefaults?: IConfigurationDefaults[];
     removedConfigurations?: IConfigurationNode[];

package/lib/utils/resourceUriConversion.js

@@ -25,7 +25,12 @@ function convertToResourceUri(resource) {
         if (parsedUri.pathSegments.resourceType) {
           path = `/${parsedUri.pathSegments.resourceType}`;
           queryData.orgName = parsedUri.pathSegments.organization;
-          queryData.resourceId = parsedUri.pathSegments.resourceId;
+          // Handle resourceId as either _id (Mongo ObjectId) or name
+          if (isMongoObjectId(parsedUri.pathSegments.resourceId)) {
+            queryData.resourceId = parsedUri.pathSegments.resourceId;
+          } else {
+            queryData.resourceName = parsedUri.pathSegments.resourceId;
+          }
           queryData.resourceGroup = parsedUri.pathSegments.resourceGroup;
         } else if (parsedUri.pathSegments.resourceGroup) {
           path = `/${IConfigCollectionName.Projects}`;
@@ -64,4 +69,12 @@ function convertToResourceUri(resource) {
     return revivedUri;
   }
   throw new Error('Unsupported resource type');
+}
+/**
+ * Utility function to check if a string is a valid MongoDB ObjectId
+ * @param id
+ */
+function isMongoObjectId(id) {
+  const objectIdRegex = /^[a-fA-F0-9]{24}$/;
+  return objectIdRegex.test(id);
 }export{convertToResourceUri,resourcePath};//# sourceMappingURL=resourceUriConversion.js.map

package/lib/utils/resourceUriConversion.js.map

@@ -1 +1 @@
-{"version":3,"file":"resourceUriConversion.js","sources":["../../src/utils/resourceUriConversion.ts"],"sourcesContent":[null],"names":[],"mappings":"8QAMA;AACa,MAAA,YAAY,GAAG,QAAC,IAA4C;AACrE,EAAA,IAAA,OAAW,QAAA,KAAa,QAAA,EAAQ;AAC5B,IAAA,OAAA;;AAEJ,EAAA,MAAA;AACA,IAAA;AACA,GAAA,GAAA;AACA,EAAA,MAAA,QAAc,cAAW,GAAA,CAAA,CAAA,EAAQ,QAAG,CAAA,KAAA,CAAA,CAAA,GAAA,EAAA;AACxC,EAAE,MAAA,QAAA,GAAA,QAAA,CAAA,QAAA,GAAA,CAAA,CAAA,EAAA,QAAA,CAAA,QAAA,CAAA,CAAA,GAAA,EAAA;AAEF,EAAM,OAAA,CAAA,EAAA,IAAU,CAAoB,EAAA,KAAA,CAAA,EAAA,QAAA,CAAA,CAAC;AACjC;AAAe,6BAAY,CAAA,QAAA,EAAA;AAC3B,EAAA,IAAA,CAAA,QAAgB,EAAA,OAAI;AAEpB,EAAA,MAAI,UAAQ,GAAA,GAAA,IAAY,QAAM,IAAA,GAAA,IAAA,MAAA,IAAA,GAAA;AAC1B,EAAA,IAAA,QAAc,YAAS,GAAA,EAAA;AACnB,IAAA,IAAA,mBAAa,CAAA,EAAA;kBAC8B,CAAA,MAAA,KAAA,SAAA,EAAA;AACvC;uBAEiD,GAAA,eAAA,CAAA,QAAA,CAAA;;gBAGjD,GAAyD,EAAA;;AAEzD,QAAA,MAAA;qBACQ,CAAA,YAAgB,CAAA;qBACX,SAAC,aAAU,CAAA,YAAsB,CAAA,CAAA;oBAC1C,OAAS,GAAC,UAAU,YAAY,CAAC,YAAY;oBAC7C,UAAU,aAAa,YAAY,CAAC,UAAY;mBACnD,CAAA,aAAA,GAAA,SAAA,CAAA,YAAA,CAAA,aAAA;AAAM,SAAA,MAAA,IAAA,sBAAc,CAAA,aAAa,EAAA;AAC9B,UAAA,IAAA,GAAA,CAAA,CAAA,EAAA,qBAAW,CAAA,QAAA,CAAqB,CAAC;oBACjC,OAAS,GAAC,SAAU,CAAA,YAAsB,CAAA;oBAC1C,yBAA0B,CAAA,YAAsB,CAAA;mBACnD,SAAA,CAAA,YAAA,CAAA,YAAA,EAAA;AAAM,UAAA,IAAA,GAAA,CAAA,CAAA,EAAA,qBAAc,CAAA,aAAa,CAAA,CAAA;AAC9B,UAAA,SAAA,CAAA,OAAO,GAAI,SAAA,CAAA,YAAqB,CAAC,YAAA;;gBAErC,IAAC,KAAA,CAAA,sBAAA,CAAA;;AACG,QAAA,OAAA,GAAA,CAAA,IAAA,CAAA;gBACJ,EAAC,SAAA,CAAA,MAAA;mBACM,EAAA,SAAI,CAAI,SAAC;;4BAEH,CAAA,SAAW,CAAA,SAAU,CAAA;oBAC9B,SAAI,CAAA;AACJ,SAAA,CAAA;;AAEH,MAAA,OAAA,QAAE;;AAEP,IAAA,MAAA,IAAA,KAAO,oDAAS,CAAA;;AAEpB,EAAA,IAAA,OAAA,QAAU,KAAM,QAAA,EAAA;IACpB,MAAC,SAAA,GAAA,GAAA,CAAA,KAAA,CAAA,QAAA,CAAA;AACD,IAAA,IAAI,SAAO,CAAA,MAAa,KAAA,SAAU,EAAC;aACzB,8BAAsB,CAAQ,CAAC;AACrC;AACI,IAAA,OAAA;;AAEJ,EAAA,IAAA,OAAA,aAAiB,QAAA,EAAA;IACrB,MAAC,UAAA,GAAA,SAAA,CAAA,QAAA,CAAA;AACD,IAAA,IAAI,UAAO,CAAA,MAAa,KAAA,SAAW,EAAA;AAC/B,MAAA,OAAA,oBAAmB,CAAA,UAAU,CAAQ,CAAC;AACtC;AACI,IAAA,OAAA;;AAEJ,EAAA,MAAA,IAAA,iCAAkB,CAAA;"}
+{"version":3,"file":"resourceUriConversion.js","sources":["../../src/utils/resourceUriConversion.ts"],"sourcesContent":[null],"names":[],"mappings":"8QAMA;AACa,MAAA,YAAY,GAAG,QAAC,IAA4C;AACrE,EAAA,IAAA,OAAW,QAAA,KAAa,QAAA,EAAQ;AAC5B,IAAA,OAAA;;AAEJ,EAAA,MAAA;AACA,IAAA;AACA,GAAA,GAAA;AACA,EAAA,MAAA,QAAc,cAAW,GAAA,CAAA,CAAA,EAAQ,QAAG,CAAA,KAAA,CAAA,CAAA,GAAA,EAAA;AACxC,EAAE,MAAA,QAAA,GAAA,QAAA,CAAA,QAAA,GAAA,CAAA,CAAA,EAAA,QAAA,CAAA,QAAA,CAAA,CAAA,GAAA,EAAA;AAEF,EAAM,OAAA,CAAA,EAAA,IAAU,CAAoB,EAAA,KAAA,CAAA,EAAA,QAAA,CAAA,CAAC;AACjC;AAAe,6BAAY,CAAA,QAAA,EAAA;AAC3B,EAAA,IAAA,CAAA,QAAgB,EAAA,OAAI;AAEpB,EAAA,MAAI,UAAQ,GAAA,GAAA,IAAY,QAAM,IAAA,GAAA,IAAA,MAAA,IAAA,GAAA;AAC1B,EAAA,IAAA,QAAc,YAAS,GAAA,EAAA;AACnB,IAAA,IAAA,mBAAa,CAAA,EAAA;kBAC8B,CAAA,MAAA,KAAA,SAAA,EAAA;AACvC;uBAEiD,GAAA,eAAA,CAAA,QAAA,CAAA;;gBAGjD,GAAyD,EAAA;;AAEzD,QAAA,MAAA;qBACQ,CAAA,YAAgB,CAAA;qBACX,SAAC,aAAU,CAAA,YAAsB,CAAA,CAAA;oBAE1C,OAA2D,GAAA,SAAA,CAAA,YAAA,CAAA,YAAA;;6BAE9C,CAAA,sBAAc,CAAA,UAAsB,CAAA,EAAA;qBAChD,CAAA,UAAA,GAAA,SAAA,CAAA,YAAA,CAAA,UAAA;;kCACa,YAAY,CAAG,YAAU,CAAY,UAAA;;oBAGnD,yBAA0B,CAAA,YAAsB,CAAA;mBACnD,SAAA,CAAA,YAAA,CAAA,aAAA,EAAA;AAAM,UAAA,IAAA,GAAA,CAAA,CAAA,EAAA,qBAAc,CAAA,QAAa,CAAA,CAAA;AAC9B,UAAA,SAAA,CAAA,OAAO,GAAI,SAAA,CAAA,YAAqB,CAAC,YAAW;oBAC5C,yBAAoB,CAAA,YAAsB,CAAA;4BACjC,CAAA,yBAAiB,EAAU;iBACvC,CAAA,CAAA,EAAA,qBAAA,CAAA,aAAA,CAAA,CAAA;AAAM,UAAA,SAAA,CAAA,mBAAc,CAAA,YAAa,CAAA,YAAe;AAC7C,SAAA,MAAA;oBACA,KAAS,CAAA,sBAAW,CAAS;;uBACzB,CAAA;AACJ,UAAA,MAAA,EAAA,SAAU,CAAA,MAAA;mBACb,EAAA,SAAA,CAAA,SAAA;;4BAEW,CAAS,SAAC,CAAM,SAAA,CAAA;oBACxB,SAAS,CAAA;;AAET;qBACQ;AACX;cACJ,KAAA,CAAA,mDAAA,CAAA;AACD;aACH,QAAA,KAAA,QAAA,EAAA;AACD,IAAA,MAAA,SAAU,GAAA,GAAM,CAAA,KAAA,CAAA,QAAA,CAAA;IACpB,IAAC,SAAA,CAAA,MAAA,KAAA,SAAA,EAAA;AACD,MAAA,OAAW,oBAAa,CAAA,SAAW,CAAA,CAAA;;AAE/B,IAAA,OAAA;AACI;aACH,QAAA,KAAA,QAAA,EAAA;AACD,IAAA,MAAA,sBAAiB,CAAA,QAAA,CAAA;IACrB,IAAC,UAAA,CAAA,MAAA,KAAA,SAAA,EAAA;AACD,MAAA,OAAW,oBAAa,CAAA,UAAW,CAAA,CAAA;AAC/B;AACA,IAAA,OAAA;AACI;QACJ,IAAC,KAAA,CAAA,2BAAA,CAAA;AACD;;AAEJ;AACJ;AAEA;;;AAGG,EAAA,OAAA,aAAA,CAAA,IAAA,CAAA,EAAA,CAAA;AACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adminide-stack/core",
-    "version": "10.0.2-alpha.4",
+    "version": "10.0.6-alpha.0",
     "description": "AdminIDE core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -22,8 +22,8 @@
     },
     "dependencies": {
         "@vscode-alt/monaco-editor": "^0.21.4",
-        "@workbench-stack/core": "3.9.5",
-        "common": "10.0.2-alpha.4",
+        "@workbench-stack/core": "3.9.7",
+        "common": "3.1.1-alpha.7",
         "query-string": "^9.0.0",
         "sort-keys": "^5.0.0",
         "vscode-uri": "^3.0.8"
@@ -35,8 +35,8 @@
     "publishConfig": {
         "access": "public"
     },
+    "gitHead": "3ed6244a67615226972d65a4332d997d420ad519",
     "typescript": {
         "definition": "lib/index.d.ts"
-    },
-    "gitHead": "707b2601a30f7ac9d18cbbc01cf9d015870fbf0f"
+    }
 }