@adminide-stack/core 10.2.2-alpha.33 → 10.2.2-alpha.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -72,21 +72,24 @@ const generateCdecodeUri = (authority, params, query = {}, fragment) => {
72
72
  */
73
73
  function parseCdecodeUri(uriString) {
74
74
  const uri = typeof uriString === 'string' ? URI.parse(uriString) : uriString;
75
+ // Handle null or undefined path
76
+ const path = uri.path === '/null' || uri.path === '/undefined' ? '/' : uri.path;
75
77
  // Split the path but preserve empty segments by not filtering
76
78
  // Remove the leading empty segment that comes from the first slash
77
- const pathSegmentsArray = uri.path.split('/');
79
+ const pathSegmentsArray = path.split('/');
78
80
  if (pathSegmentsArray[0] === '') {
79
81
  pathSegmentsArray.shift(); // Remove the first empty segment from leading slash
80
82
  }
81
83
  const pathSegments = {};
82
84
  // Parse query and fragment
83
- const queryData = queryString.parse(uri?.query);
84
- let fragmentData = uri?.fragment;
85
+ const queryData = queryString.parse(uri?.query || '');
86
+ let fragmentData = uri?.fragment || '';
85
87
  if (uri?.fragment?.includes('=')) {
86
- fragmentData = queryString.parse(uri?.fragment);
88
+ fragmentData = queryString.parse(uri.fragment);
87
89
  }
88
- if (pathSegmentsArray.length === 0) {
89
- // Handle the case with no path segments (e.g., `cdecode://us-west-2/`)
90
+ // Handle empty or invalid path segments
91
+ if (pathSegmentsArray.length === 0 || pathSegmentsArray.length === 1 && (pathSegmentsArray[0] === 'null' || pathSegmentsArray[0] === 'undefined')) {
92
+ // Handle the case with no path segments or null/undefined path
90
93
  return {
91
94
  scheme: uri.scheme,
92
95
  authority: uri.authority,
@@ -1 +1 @@
1
- {"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -5,13 +5,13 @@ export declare function getOpenSettings(target: ConfigurationTarget, resource: U
5
5
  defaultPreferencesInput: URI;
6
6
  };
7
7
  /**
8
- * Tries to parse the extension name from a URI path that might look like:
8
+ * Tries to parse the "extension name" from a URI path that might look like:
9
9
  * /myExtension/settings.json
10
10
  * /defaultsettings/resourceSettings.json
11
11
  * /someFolder/myExtension/organizationSettings.json
12
12
  *
13
- * If the last path segment is one of the known settings files, return
14
- * the second-to-last segment as the extension name. Otherwise, return settings by default.
13
+ * If the last path segment is one of the "known" settings files, return
14
+ * the second-to-last segment as the extension name. Otherwise, return "settings" by default.
15
15
  */
16
16
  export declare function parseExtensionFromDefaultSettingsUri(resource: URI): string;
17
17
  export declare function getDefaultSettingsURI(target: ConfigurationTarget, options: IPreferencesOpenOptionsInput): URI;
@@ -7,7 +7,7 @@ function getOpenSettings(target, resource, options) {
7
7
  query: editableSettingsResource.query,
8
8
  // Use editableSettingsResource.fragment if none was explicitly set.
9
9
  defaultFragment: options?.defaultFragment ?? editableSettingsResource.fragment,
10
- // Use the provided extensionName, or derive it from the resources path
10
+ // Use the provided extensionName, or derive it from the resource's path
11
11
  extensionName: options?.extensionName ?? parseExtensionFromDefaultSettingsUri(editableSettingsResource)
12
12
  };
13
13
  const defaultPreferencesResource = getDefaultSettingsURI(target, mergedOptions);
@@ -17,13 +17,13 @@ function getOpenSettings(target, resource, options) {
17
17
  };
18
18
  }
19
19
  /**
20
- * Tries to parse the extension name from a URI path that might look like:
20
+ * Tries to parse the "extension name" from a URI path that might look like:
21
21
  * /myExtension/settings.json
22
22
  * /defaultsettings/resourceSettings.json
23
23
  * /someFolder/myExtension/organizationSettings.json
24
24
  *
25
- * If the last path segment is one of the known settings files, return
26
- * the second-to-last segment as the extension name. Otherwise, return settings by default.
25
+ * If the last path segment is one of the "known" settings files, return
26
+ * the second-to-last segment as the extension name. Otherwise, return "settings" by default.
27
27
  */
28
28
  function parseExtensionFromDefaultSettingsUri(resource) {
29
29
  const pathSegments = resource.path.split('/').filter(Boolean);
@@ -46,7 +46,7 @@ function parseExtensionFromDefaultSettingsUri(resource) {
46
46
  if (lastSegment.endsWith('.json')) {
47
47
  // e.g. "/myExtension/otherFile.json" → extension = "otherFile" (or 2nd to last segment?)
48
48
  // This snippet assumes you want "otherFile" from the last segment. If you instead want
49
- // the second-to-last segment as an extensionName,” just adjust accordingly.
49
+ // the second-to-last segment as an "extensionName," just adjust accordingly.
50
50
  const trimmed = lastSegment.replace(/\.json$/, '');
51
51
  return trimmed || ConfigurationContributionNames.Settings;
52
52
  }
@@ -90,14 +90,15 @@ function getEditableSettingsURI(resource, options = {
90
90
  fragment
91
91
  } = options;
92
92
  if (options?.subFragment) {
93
- // If theres a subFragment, stitch it into the main fragment
93
+ // If there's a subFragment, stitch it into the main fragment
94
94
  fragment = fragment ? fragment.concat(`.${options.subFragment}`) : options.subFragment;
95
95
  }
96
- // Fall back to the resources existing fragment if neither fragment nor subFragment is provided
96
+ // Fall back to the resource's existing fragment if neither fragment nor subFragment is provided
97
97
  const finalFragment = fragment ?? resource.fragment;
98
- // Create a new URI with the possibly updated fragment
98
+ // Create a new URI with the possibly updated fragment, make sure to include authority.
99
99
  const newResource = URI.from({
100
100
  scheme: resource.scheme,
101
+ authority: resource.authority,
101
102
  path: resource.path,
102
103
  query: resource.query,
103
104
  fragment: finalFragment
@@ -1 +1 @@
1
- {"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adminide-stack/core",
3
- "version": "10.2.2-alpha.33",
3
+ "version": "10.2.2-alpha.39",
4
4
  "description": "AdminIDE core for higher packages to depend on",
5
5
  "license": "UNLICENSED",
6
6
  "author": "CDMBase LLC",
@@ -35,7 +35,7 @@
35
35
  "publishConfig": {
36
36
  "access": "public"
37
37
  },
38
- "gitHead": "f1b72678cb1dc6033c403814b3e13af2925be0f7",
38
+ "gitHead": "9ba53a70f205625f6d67eeb1e77f4e2fe4e01ba8",
39
39
  "typescript": {
40
40
  "definition": "lib/index.d.ts"
41
41
  }