@adminide-stack/core 9.2.1-alpha.3 → 9.2.1-alpha.35

package/lib/utils/preferenceUri.js

@@ -0,0 +1,107 @@
+import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {IConfigurationContributionNames}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';import {convertToResourceUri}from'./resourceUriConversion.js';const KNOWN_SETTINGS_FILES = new Set(['settings.json', 'organizationSettings.json', 'resourceSettings.json', 'machineSettings.json', 'applicationSettings.json', 'organizationsettings.json', 'resourcesettings.json', 'machinesettings.json', 'applicationsettings.json']);
+function getOpenSettings(target, resource, options) {
+  const editableSettingsResource = getEditableSettingsURI(resource, options);
+  const mergedOptions = {
+    ...options,
+    authority: editableSettingsResource.authority,
+    query: editableSettingsResource.query,
+    // Use editableSettingsResource.fragment if none was explicitly set.
+    defaultFragment: options?.defaultFragment ?? editableSettingsResource.fragment,
+    // Use the provided extensionName, or derive it from the resource’s path
+    extensionName: options?.extensionName ?? parseExtensionFromDefaultSettingsUri(editableSettingsResource)
+  };
+  const defaultPreferencesResource = getDefaultSettingsURI(target, mergedOptions);
+  return {
+    editableSettingsInput: editableSettingsResource,
+    defaultPreferencesInput: defaultPreferencesResource
+  };
+}
+/**
+ * Tries to parse the “extension name” from a URI path that might look like:
+ *   /myExtension/settings.json
+ *   /defaultsettings/resourceSettings.json
+ *   /someFolder/myExtension/organizationSettings.json
+ *
+ * If the last path segment is one of the “known” settings files, return
+ * the second-to-last segment as the extension name. Otherwise, return “settings” by default.
+ */
+function parseExtensionFromDefaultSettingsUri(resource) {
+  const pathSegments = resource.path.split('/').filter(Boolean);
+  if (pathSegments.length === 0) {
+    return 'settings';
+  }
+  const lastSegment = pathSegments[pathSegments.length - 1].toLowerCase();
+  // 1) If the last segment is among the known settings files (ends with .json)
+  if (KNOWN_SETTINGS_FILES.has(lastSegment)) {
+    // We expect the extension name to be the second-to-last segment
+    // e.g. "/myExtension/settings.json" or "/some/folder/ext/organizationSettings.json"
+    if (pathSegments.length >= 2) {
+      return pathSegments[pathSegments.length - 2];
+    }
+    // If there's only one segment overall, fallback
+    return IConfigurationContributionNames.Settings;
+  }
+  // 2) If it still ends with .json but not a standard settings file, just remove ".json"
+  //    and treat that as the extension name. (Optional logic)
+  if (lastSegment.endsWith('.json')) {
+    // e.g. "/myExtension/otherFile.json" → extension = "otherFile" (or 2nd to last segment?)
+    // This snippet assumes you want "otherFile" from the last segment. If you instead want
+    // the second-to-last segment as an “extensionName,” just adjust accordingly.
+    const trimmed = lastSegment.replace(/\.json$/, '');
+    return trimmed || IConfigurationContributionNames.Settings;
+  }
+  // 3) If no recognized .json file, just fallback
+  return IConfigurationContributionNames.Settings;
+}
+function getDefaultSettingsURI(target, options) {
+  const extension = options.extensionName || IConfigurationContributionNames.Settings;
+  switch (target) {
+    case 4 /* ConfigurationTarget.ORGANIZATION */:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/organizationSettings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+    case 5 /* ConfigurationTarget.ORGANIZATION_RESOURCE */:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/resourceSettings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+    default:
+      return URI.from({
+        scheme: 'cdecode',
+        authority: options.authority,
+        path: `/${extension}/settings.json`,
+        query: options.query,
+        fragment: options.defaultFragment
+      });
+  }
+}
+function getEditableSettingsURI(resource, options = {
+  forceExist: false
+}) {
+  // Grab the existing or new fragment from options
+  let {
+    fragment
+  } = options;
+  if (options?.subFragment) {
+    // If there’s a subFragment, stitch it into the main fragment
+    fragment = fragment ? fragment.concat(`.${options.subFragment}`) : options.subFragment;
+  }
+  // Fall back to the resource’s existing fragment if neither fragment nor subFragment is provided
+  const finalFragment = fragment ?? resource.fragment;
+  // Create a new URI with the possibly updated fragment
+  const newResource = URI.from({
+    scheme: resource.scheme,
+    path: resource.path,
+    query: resource.query,
+    fragment: finalFragment
+  });
+  // Always convert to resource-based URI
+  return convertToResourceUri(newResource);
+}export{getDefaultSettingsURI,getEditableSettingsURI,getOpenSettings,parseExtensionFromDefaultSettingsUri};//# sourceMappingURL=preferenceUri.js.map

package/lib/utils/preferenceUri.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/utils/preferenceUri.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/resourceUriConversion.js

@@ -0,0 +1,68 @@
+import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import queryString from'query-string';import {parseCdecodeUri}from'./cdecodeUri.js';import {IConfigCollectionName}from'../interfaces/generated/generated-models.js';import'../interfaces/configuration/configuration.js';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';// moved to `@workbench-stack/core`
+const resourcePath = resource => {
+  if (typeof resource === 'string') {
+    return resource;
+  }
+  const {
+    path
+  } = resource;
+  const query = resource.query ? `:${resource.query}` : '';
+  const fragment = resource.fragment ? `:${resource.fragment}` : '';
+  return `${path}${query}${fragment}`;
+};
+function convertToResourceUri(resource) {
+  if (!resource) return null;
+  const isValidUri = uri => 'scheme' in uri && 'path' in uri;
+  if (resource instanceof URI) {
+    if (isValidUri(resource)) {
+      if (resource.scheme === 'cdecode') {
+        // Use parseCdecodeUri for cdecode URIs
+        const parsedUri = parseCdecodeUri(resource);
+        // Determine the path based on available segments
+        let path = '';
+        // Construct the query string based on available segments
+        const queryData = {};
+        if (parsedUri.pathSegments.resourceType) {
+          path = `/${parsedUri.pathSegments.resourceType}`;
+          queryData.orgName = parsedUri.pathSegments.organization;
+          queryData.resourceId = parsedUri.pathSegments.resourceId;
+          queryData.resourceGroup = parsedUri.pathSegments.resourceGroup;
+        } else if (parsedUri.pathSegments.resourceGroup) {
+          path = `/${IConfigCollectionName.Projects}`;
+          queryData.orgName = parsedUri.pathSegments.organization;
+          queryData.resourceGroup = parsedUri.pathSegments.resourceGroup;
+        } else if (parsedUri.pathSegments.organization) {
+          path = `/${IConfigCollectionName.Organizations}`;
+          queryData.orgName = parsedUri.pathSegments.organization;
+        } else {
+          throw new Error('not a valid resource');
+        }
+        return URI.from({
+          scheme: parsedUri.scheme,
+          authority: parsedUri.authority,
+          path,
+          query: queryString.stringify(queryData),
+          fragment: parsedUri.fragmentData
+        });
+      }
+      return resource;
+    }
+    throw new Error('Invalid URI instance: Missing required properties');
+  }
+  if (typeof resource === 'string') {
+    const parsedUri = URI.parse(resource);
+    if (parsedUri.scheme === 'cdecode') {
+      return convertToResourceUri(parsedUri); // Reuse the logic for URI instances
+    }
+    return parsedUri;
+  }
+  if (typeof resource === 'object') {
+    console.log('---RESOUR_---', resource);
+    const revivedUri = URI.revive(resource);
+    if (revivedUri.scheme === 'cdecode') {
+      return convertToResourceUri(revivedUri); // Reuse the logic for URI instances
+    }
+    return revivedUri;
+  }
+  throw new Error('Unsupported resource type');
+}export{convertToResourceUri,resourcePath};//# sourceMappingURL=resourceUriConversion.js.map

package/lib/utils/resourceUriConversion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resourceUriConversion.js","sources":["../../src/utils/resourceUriConversion.ts"],"sourcesContent":[null],"names":[],"mappings":"6fAKA;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,OAAC,CAAA,GAAA,CAAA,eAAA,EAAA,QAAA,CAAA;AACD,IAAA,MAAW,UAAA,GAAQ,GAAK,CAAA,MAAA,CAAA,QAAW,CAAA;AAC/B,IAAA,IAAA,UAAW,CAAA,oBAAkB,EAAA;aACvB,+BAAwB,CAAA,CAAQ;AACtC;AACI,IAAA,OAAA;;AAEJ,EAAA,MAAA,IAAA,iCAAkB,CAAA;"}

package/lib/utils/resourceUriConversion.test.d.ts

@@ -0,0 +1 @@
+import 'reflect-metadata';

package/lib/utils/reviveUri.d.ts

@@ -0,0 +1,2 @@
+import { URI, UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
+export declare function reviveUri(resource: URI | string | UriComponents): URI;

package/lib/utils/{uri.js → reviveUri.js}

@@ -1,6 +1,4 @@
-import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';// moved to `@workbench-stack/core`
-const resourcePath = resource => typeof resource === 'string' ? resource : `${resource.path}:${resource.query}:${resource.fragment}`;
-function convertToResourceUri(resource) {
+import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';function reviveUri(resource) {
   if (resource instanceof URI) {
     return resource;
   } else if (typeof resource === 'string') {
@@ -9,4 +7,4 @@ function convertToResourceUri(resource) {
   } else if (typeof resource === 'object') {
     return URI.revive(resource);
   }
-}export{convertToResourceUri,resourcePath};//# sourceMappingURL=uri.js.map
+}export{reviveUri};//# sourceMappingURL=reviveUri.js.map

package/lib/utils/reviveUri.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reviveUri.js","sources":["../../src/utils/reviveUri.ts"],"sourcesContent":[null],"names":[],"mappings":"sEAEM,SAAU,SAAS,CAAC,QAAsC,EAAA;AAC5D,EAAA,IAAA,QAAY,YAAA,GAAe,EAAA;AACvB,IAAA,OAAA;SACH,IAAA,OAAA,QAAA,KAAA,QAAA,EAAA;AAAM;WACgB,GAAA,CAAA,KAAA,CAAA,QAAA,CAAA;AACnB,GAAA,MAAA,IAAA,OAAW,QAAM,KAAQ,QAAE,EAAA;IAC/B,OAAC,GAAA,CAAA,MAAA,CAAA,QAAA,CAAA;AAAM;AACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adminide-stack/core",
-    "version": "9.2.1-alpha.3",
+    "version": "9.2.1-alpha.35",
     "description": "AdminIDE core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -15,7 +15,7 @@
         "build:lib:watch": "npm run build:lib -- --watch",
         "jest": "./node_modules/.bin/jest",
         "prepublish": "npm run build",
-        "test": "jest",
+        "test": "vitest",
         "test:debug": "npm test -- --runInBand",
         "test:watch": "npm test -- --watch",
         "watch": "npm run build:lib:watch"
@@ -34,8 +34,8 @@
     "publishConfig": {
         "access": "public"
     },
+    "gitHead": "a24ef09a892f119297ec7f467d0639cbb17b7baf",
     "typescript": {
         "definition": "lib/index.d.ts"
-    },
-    "gitHead": "42887edb082ec3f8f1bf448b51adb935973a9339"
+    }
 }

package/lib/utils/uri.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"uri.js","sources":["../../src/utils/uri.ts"],"sourcesContent":[null],"names":[],"mappings":"sEACA;AACO,MAAM,YAAY,GAAG,QAA0C,IAAI,OAAQ,QAAA,KAAa,QAAA,GAAS,QAAU,GAAC,CAAC,EAAI,QAAA,CAAA,IAAa,CAAA,CAAA,EAAA,QAAY,CAAA,OAAM,EAAI,QAAA,CAAA,QAAS,CAAA;AAG9J,SAAU,oBAAoB,CAAC,QAAsC,EAAA;AACvE,EAAA,IAAA,QAAY,YAAA,GAAe,EAAA;AACvB,IAAA,OAAA;SACH,IAAA,OAAA,QAAA,KAAA,QAAA,EAAA;AAAM;WACgB,GAAA,CAAA,KAAA,CAAA,QAAA,CAAA;AACnB,GAAA,MAAA,IAAA,OAAW,QAAM,KAAQ,QAAE,EAAA;IAC/B,OAAC,GAAA,CAAA,MAAA,CAAA,QAAA,CAAA;AAAM;AACH"}