@adminide-stack/core 11.0.1-alpha.7 → 12.0.1-alpha.0

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.
Files changed (89) hide show
  1. package/lib/constants/index.d.ts +0 -2
  2. package/lib/core/configurations/configuration.d.ts +24 -25
  3. package/lib/core/configurations/configuration.js +1 -1
  4. package/lib/core/configurations/configuration.js.map +1 -1
  5. package/lib/core/configurations/events/ConfigurationChangeEvent.d.ts +1 -1
  6. package/lib/core/configurations/events/ConfigurationChangeEvent.js +1 -1
  7. package/lib/core/configurations/events/ConfigurationChangeEvent.js.map +1 -1
  8. package/lib/core/configurations/helpers/configuration.d.ts +1 -1
  9. package/lib/core/configurations/helpers/configuration.js +1 -1
  10. package/lib/core/configurations/helpers/configuration.js.map +1 -1
  11. package/lib/core/configurations/models/ConfigurationModel.d.ts +3 -3
  12. package/lib/core/configurations/models/ConfigurationModel.js.map +1 -1
  13. package/lib/core/organization/configuration.d.ts +1 -2
  14. package/lib/core/organization/configuration.js +1 -1
  15. package/lib/core/organization/configuration.js.map +1 -1
  16. package/lib/core/organization/helpers/organization-helpers.d.ts +1 -1
  17. package/lib/core/organization/organization.d.ts +1 -1
  18. package/lib/index.d.ts +0 -1
  19. package/lib/index.js +1 -1
  20. package/lib/interfaces/configuration/configuration-server-service.d.ts +1 -1
  21. package/lib/interfaces/configuration/configuration.d.ts +1 -2
  22. package/lib/interfaces/configuration/configuration.js +1 -1
  23. package/lib/interfaces/configuration/configuration.js.map +1 -1
  24. package/lib/interfaces/configuration/configurationRegistry.d.ts +4 -2
  25. package/lib/interfaces/configuration/configuraton-service.d.ts +1 -1
  26. package/lib/interfaces/configuration/defaultSettingSnapshot.d.ts +1 -1
  27. package/lib/interfaces/index.d.ts +0 -2
  28. package/lib/interfaces/organization/organizations-context.d.ts +1 -0
  29. package/lib/interfaces/page-store.d.ts +2 -16
  30. package/lib/interfaces/platform.d.ts +2 -0
  31. package/lib/interfaces/preferences-service.d.ts +1 -23
  32. package/lib/services/abstract-configuration.d.ts +1 -1
  33. package/lib/services/abstract-configuration.js +1 -1
  34. package/lib/services/abstract-organization-context-service.d.ts +1 -1
  35. package/lib/services/abstract-organization-context-service.js +1 -1
  36. package/lib/services/abstract-organization-context-service.js.map +1 -1
  37. package/lib/utils/cdecodeUri.d.ts +1 -1
  38. package/lib/utils/cdecodeUri.js +107 -43
  39. package/lib/utils/cdecodeUri.js.map +1 -1
  40. package/lib/utils/configuration-utils.d.ts +1 -1
  41. package/lib/utils/generate-uri.d.ts +8 -7
  42. package/lib/utils/generate-uri.js +17 -13
  43. package/lib/utils/generate-uri.js.map +1 -1
  44. package/lib/utils/generated-settings-id.js +1 -1
  45. package/lib/utils/generated-settings-id.js.map +1 -1
  46. package/lib/utils/getUserAlias.d.ts +1 -1
  47. package/lib/utils/getUserAlias.js +1 -1
  48. package/lib/utils/getUserAlias.js.map +1 -1
  49. package/lib/utils/nodeContext.d.ts +1 -2
  50. package/lib/utils/nodeContext.js +1 -1
  51. package/lib/utils/nodeContext.js.map +1 -1
  52. package/lib/utils/preferenceUri.d.ts +4 -4
  53. package/lib/utils/preferenceUri.js +10 -9
  54. package/lib/utils/preferenceUri.js.map +1 -1
  55. package/lib/utils/resourceUriConversion.js +21 -11
  56. package/lib/utils/resourceUriConversion.js.map +1 -1
  57. package/lib/utils/splitCdecodeUri.d.ts +28 -0
  58. package/lib/utils/splitCdecodeUri.js +47 -2
  59. package/lib/utils/splitCdecodeUri.js.map +1 -1
  60. package/lib/vscodeExport/index.d.ts +3 -0
  61. package/package.json +5 -3
  62. package/lib/constants/scheme.d.ts +0 -40
  63. package/lib/constants/scheme.js +0 -43
  64. package/lib/constants/scheme.js.map +0 -1
  65. package/lib/constants/types.d.ts +0 -19
  66. package/lib/constants/types.js +0 -19
  67. package/lib/constants/types.js.map +0 -1
  68. package/lib/enums/connection-status.d.ts +0 -6
  69. package/lib/enums/connection-status.js +0 -7
  70. package/lib/enums/connection-status.js.map +0 -1
  71. package/lib/enums/index.d.ts +0 -6
  72. package/lib/enums/integration-configuration-status.d.ts +0 -5
  73. package/lib/enums/integration-configuration-status.js +0 -6
  74. package/lib/enums/integration-configuration-status.js.map +0 -1
  75. package/lib/enums/integrations-configuration-steps.d.ts +0 -8
  76. package/lib/enums/integrations-configuration-steps.js +0 -9
  77. package/lib/enums/integrations-configuration-steps.js.map +0 -1
  78. package/lib/enums/integrations-connection-names.d.ts +0 -12
  79. package/lib/enums/integrations-connection-names.js +0 -14
  80. package/lib/enums/integrations-connection-names.js.map +0 -1
  81. package/lib/enums/integrations.d.ts +0 -11
  82. package/lib/enums/integrations.js +0 -12
  83. package/lib/enums/integrations.js.map +0 -1
  84. package/lib/enums/permissions.d.ts +0 -7
  85. package/lib/enums/permissions.js +0 -8
  86. package/lib/enums/permissions.js.map +0 -1
  87. package/lib/interfaces/apollo-context.d.ts +0 -66
  88. package/lib/interfaces/log/index.d.ts +0 -1
  89. package/lib/interfaces/log/log-service.d.ts +0 -16
@@ -3,7 +3,7 @@ import { Event, Emitter } from '@vscode-alt/monaco-editor/esm/vs/base/common/eve
3
3
  import { Disposable } from '@workbench-stack/core/lib/services/lifecycle/disposable.js';
4
4
  import { Barrier } from '@vscode-alt/monaco-editor/esm/vs/base/common/async';
5
5
  import { CdmLogger } from '@cdm-logger/core';
6
- import { IOrganizationIdentifier, IOrganizationData } from 'common/lib/generated/generated-models.js';
6
+ import { IOrganizationIdentifier, IOrganizationData } from 'common';
7
7
  import { OrganizationContext } from '../core';
8
8
  import { IConfigurationChangeEvent, IClientOrganizationContextService, ApplicationState, IOrganizationResource, IOrganizationResourceCreationData, IOrganizationResourcesChangeEvent, ISingleResourceOrganizationIdentifier } from '../interfaces';
9
9
  type ILogger = CdmLogger.ILogger;
@@ -1,4 +1,4 @@
1
- import {__decorate,__param,__metadata}from'tslib';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Emitter}from'@vscode-alt/monaco-editor/esm/vs/base/common/event.js';import {Disposable}from'@workbench-stack/core/lib/services/lifecycle/disposable.js';import {Barrier}from'@vscode-alt/monaco-editor/esm/vs/base/common/async.js';import {injectable,inject}from'inversify';import {CommonType}from'@common-stack/core';import {isEqual}from'@vscode-alt/monaco-editor/esm/vs/base/common/resources.js';import'../core/disposable.js';import'../core/event.js';import {OrganizationResource,OrganizationContext}from'../core/organization/organization.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'common/lib/generated/generated-models.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/map.js';import'../constants/types.js';import'../constants/urls.js';import'../constants/routes.js';import'../constants/scheme.js';import'@workbench-stack/core/lib/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 {isOrganizationIdentifier,isSingleResourceOrganizationIdentifier}from'../core/organization/helpers/organization-helpers.js';let AbstractOrganizationContextService = class AbstractOrganizationContextService extends Disposable {
1
+ import {__decorate,__param,__metadata}from'tslib';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Emitter}from'@vscode-alt/monaco-editor/esm/vs/base/common/event.js';import {Disposable}from'@workbench-stack/core/lib/services/lifecycle/disposable.js';import {Barrier}from'@vscode-alt/monaco-editor/esm/vs/base/common/async.js';import {injectable,inject}from'inversify';import {CommonType}from'@common-stack/core';import {isEqual}from'@vscode-alt/monaco-editor/esm/vs/base/common/resources.js';import'../core/disposable.js';import'../core/event.js';import {OrganizationResource,OrganizationContext}from'../core/organization/organization.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'common';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/map.js';import'../constants/urls.js';import'../constants/routes.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'common/lib/generated/generated-models.js';import {isOrganizationIdentifier,isSingleResourceOrganizationIdentifier}from'../core/organization/helpers/organization-helpers.js';let AbstractOrganizationContextService = class AbstractOrganizationContextService extends Disposable {
2
2
  completeOrganizationBarrier;
3
3
  updateOrganizationBarrier;
4
4
  logger;
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-organization-context-service.js","sources":["../../src/services/abstract-organization-context-service.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-organization-context-service.js","sources":["../../src/services/abstract-organization-context-service.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
2
- import { ICdecodeUriPathSegment, IAuthorityComponent, ConfigurationTarget, ICdecodeParsedUri } from 'common/lib/generated/generated-models.js';
2
+ import { ICdecodeUriPathSegment, IAuthorityComponent, ConfigurationTarget, ICdecodeParsedUri } from 'common';
3
3
  export declare const generateCdecodeUri: (authority: string | IAuthorityComponent, params: ICdecodeUriPathSegment, query?: {
4
4
  [key: string]: string | number;
5
5
  }, fragment?: string) => URI;
@@ -1,4 +1,4 @@
1
- import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Schemas}from'@workbench-stack/core/lib/core/network.js';import sortKeys from'sort-keys';import queryString from'query-string';import {ConfigCollectionName}from'common/lib/generated/generated-models.js';/* eslint-disable prefer-destructuring */
1
+ import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {Scheme,ConfigCollectionName}from'common';/* eslint-disable prefer-destructuring */
2
2
  /* eslint-disable default-param-last */
3
3
  const generateCdecodeUri = (authority, params, query = {}, fragment) => {
4
4
  let authorityString;
@@ -44,7 +44,7 @@ const generateCdecodeUri = (authority, params, query = {}, fragment) => {
44
44
  // Conditionally include the leading slash
45
45
  const path = pathSegments.length > 0 ? `/${pathSegments.join('/')}` : '/';
46
46
  return URI.from({
47
- scheme: Schemas.cdecode,
47
+ scheme: Scheme.CDECODE,
48
48
  authority: authorityString,
49
49
  path,
50
50
  query: queryInString,
@@ -72,18 +72,44 @@ 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
- const pathSegmentsArray = uri.path.split('/').filter(Boolean); // Clean the path segments
75
+ // Handle null or undefined path
76
+ const path = uri.path === '/null' || uri.path === '/undefined' ? '/' : uri.path;
77
+ // Split the path but preserve empty segments by not filtering
78
+ // Remove the leading empty segment that comes from the first slash
79
+ const pathSegmentsArray = path.split('/');
80
+ if (pathSegmentsArray[0] === '') {
81
+ pathSegmentsArray.shift(); // Remove the first empty segment from leading slash
82
+ }
76
83
  const pathSegments = {
77
- organization: pathSegmentsArray[0] || undefined // Organization is required if present
84
+ organization: ''
78
85
  };
79
86
  // Parse query and fragment
80
- const queryData = queryString.parse(uri?.query);
81
- let fragmentData = uri?.fragment;
87
+ const queryData = queryString.parse(uri?.query || '');
88
+ let fragmentData = uri?.fragment || '';
82
89
  if (uri?.fragment?.includes('=')) {
83
- fragmentData = queryString.parse(uri?.fragment);
90
+ fragmentData = queryString.parse(uri.fragment);
84
91
  }
85
- if (pathSegmentsArray.length === 0) {
86
- // Handle the case with no path segments (e.g., `cdecode://us-west-2/`)
92
+ if (uri.scheme === Scheme.CDECODE_RESOURCE) {
93
+ // Remove leading slash and get resource type
94
+ const resourceType = path.substring(1);
95
+ if (resourceType === ConfigCollectionName.Organizations) {
96
+ // Organization URI format: /organizations?name=orgName
97
+ pathSegments.organization = queryData.name || '';
98
+ } else if (resourceType === ConfigCollectionName.Projects) {
99
+ // Project URI format: /projects?orgName=org&resourceGroup=group
100
+ pathSegments.organization = queryData.orgName || '';
101
+ } else {
102
+ // Resource URI format: /resourceType?_id=id&orgName=org
103
+ // or: /resourceType?field=value&orgName=org
104
+ pathSegments.resourceType = resourceType;
105
+ pathSegments.organization = queryData.orgName || '';
106
+ // Handle different ID fields (_id, name, email, etc)
107
+ if (queryData._id) {
108
+ pathSegments.resourceId = queryData._id;
109
+ } else if (queryData.name) {
110
+ pathSegments.resourceId = `name:${queryData.name}`;
111
+ }
112
+ }
87
113
  return {
88
114
  scheme: uri.scheme,
89
115
  authority: uri.authority,
@@ -91,43 +117,81 @@ function parseCdecodeUri(uriString) {
91
117
  queryData,
92
118
  fragmentData
93
119
  };
94
- }
95
- if (pathSegmentsArray.length === 3) {
96
- // Case: organization/resourceType/resourceId
97
- const possibleResourceType = pathSegmentsArray[1];
98
- const resourceId = pathSegmentsArray[2];
99
- // Validate the resourceType against ConfigCollectionName
100
- const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
101
- if (!isResourceType) {
102
- throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
120
+ } else if (uri.scheme === Scheme.CDECODE) {
121
+ // Handle empty or invalid path segments
122
+ if (pathSegmentsArray.length === 0 || pathSegmentsArray.length === 1 && (pathSegmentsArray[0] === 'null' || pathSegmentsArray[0] === 'undefined')) {
123
+ // Handle the case with no path segments or null/undefined path
124
+ return {
125
+ scheme: uri.scheme,
126
+ authority: uri.authority,
127
+ pathSegments,
128
+ queryData,
129
+ fragmentData
130
+ };
131
+ }
132
+ // Handle empty segments (like `//accounts/resourceId`)
133
+ if (pathSegmentsArray.length >= 2 && pathSegmentsArray[0] === '') {
134
+ // Empty organization segment
135
+ if (pathSegmentsArray.length >= 3 && pathSegmentsArray[1] === '') {
136
+ // Empty resourceGroup segment also
137
+ const possibleResourceType = pathSegmentsArray[2];
138
+ const resourceId = pathSegmentsArray[3];
139
+ // Validate resourceType exists in ConfigCollectionName
140
+ const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
141
+ if (isResourceType && resourceId) {
142
+ pathSegments.resourceType = possibleResourceType;
143
+ pathSegments.resourceId = resourceId;
144
+ return {
145
+ scheme: uri.scheme,
146
+ authority: uri.authority,
147
+ pathSegments,
148
+ queryData,
149
+ fragmentData
150
+ };
151
+ }
152
+ }
103
153
  }
104
- // Assign resourceType and resourceId
105
- pathSegments.resourceType = possibleResourceType;
106
- pathSegments.resourceId = resourceId;
107
- } else if (pathSegmentsArray.length === 2) {
108
- // Case: organization/project or organization/resourceType
109
- const possibleResourceTypeOrProject = pathSegmentsArray[1];
110
- // Check if it's a valid resourceType
111
- const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceTypeOrProject);
112
- if (isResourceType) {
113
- // If it's a valid resourceType, validate further
114
- throw new Error(`Invalid URI structure: The resourceType "${possibleResourceTypeOrProject}" is missing the resourceId.`);
154
+ // Non-empty first segment is the organization
155
+ if (pathSegmentsArray[0] !== '') {
156
+ pathSegments.organization = pathSegmentsArray[0];
115
157
  }
116
- // Otherwise, treat it as a project
117
- pathSegments.resourceGroup = possibleResourceTypeOrProject;
118
- } else if (pathSegmentsArray.length > 3) {
119
- // Case: organization/project/resourceType/resourceId
120
- pathSegments.resourceGroup = pathSegmentsArray[1];
121
- const possibleResourceType = pathSegmentsArray[2];
122
- const resourceId = pathSegmentsArray[3];
123
- // Validate the resourceType
124
- const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
125
- if (!isResourceType) {
126
- throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
158
+ if (pathSegmentsArray.length === 3) {
159
+ // Case: organization/resourceType/resourceId
160
+ const possibleResourceType = pathSegmentsArray[1];
161
+ const resourceId = pathSegmentsArray[2];
162
+ // Validate the resourceType against ConfigCollectionName
163
+ const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
164
+ if (!isResourceType) {
165
+ throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
166
+ }
167
+ // Assign resourceType and resourceId
168
+ pathSegments.resourceType = possibleResourceType;
169
+ pathSegments.resourceId = resourceId;
170
+ } else if (pathSegmentsArray.length === 2) {
171
+ // Case: organization/project or organization/resourceType
172
+ const possibleResourceTypeOrProject = pathSegmentsArray[1];
173
+ // Check if it's a valid resourceType
174
+ const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceTypeOrProject);
175
+ if (isResourceType) {
176
+ // If it's a valid resourceType, validate further
177
+ throw new Error(`Invalid URI structure: The resourceType "${possibleResourceTypeOrProject}" is missing the resourceId.`);
178
+ }
179
+ // Otherwise, treat it as a project
180
+ pathSegments.resourceGroup = possibleResourceTypeOrProject;
181
+ } else if (pathSegmentsArray.length > 3) {
182
+ // Case: organization/project/resourceType/resourceId
183
+ pathSegments.resourceGroup = pathSegmentsArray[1];
184
+ const possibleResourceType = pathSegmentsArray[2];
185
+ const resourceId = pathSegmentsArray[3];
186
+ // Validate the resourceType
187
+ const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
188
+ if (!isResourceType) {
189
+ throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
190
+ }
191
+ // Assign resourceType and resourceId
192
+ pathSegments.resourceType = possibleResourceType;
193
+ pathSegments.resourceId = resourceId;
127
194
  }
128
- // Assign resourceType and resourceId
129
- pathSegments.resourceType = possibleResourceType;
130
- pathSegments.resourceId = resourceId;
131
195
  }
132
196
  return {
133
197
  scheme: uri.scheme,
@@ -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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"}
@@ -1,4 +1,4 @@
1
- import { ConfigurationScope, IConfigurationNode } from 'common/lib/generated/generated-models.js';
1
+ import { ConfigurationScope, IConfigurationNode } from 'common';
2
2
  /**
3
3
  * Retrieves the scope (ConfigurationScope) for each registered property.
4
4
  * If tenantId is provided, retrieves only that tenant's properties.
@@ -1,5 +1,9 @@
1
1
  import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
2
- import { ConfigCollectionName, ConfigFragmentName } from 'common/lib/generated/generated-models.js';
2
+ import { ConfigCollectionName, ConfigFragmentName, Scheme } from 'common';
3
+ declare const defaultOptions: {
4
+ flatten: boolean;
5
+ scheme: Scheme;
6
+ };
3
7
  /**
4
8
  * Generate URI, it sorts the params in order to generate URI.
5
9
  * @param collectionName Schema Name to be used
@@ -9,9 +13,7 @@ import { ConfigCollectionName, ConfigFragmentName } from 'common/lib/generated/g
9
13
  */
10
14
  export declare const generateUri: (collectionName: ConfigCollectionName, params: {
11
15
  [key: string]: any;
12
- }, fragment: string, authority?: string, options?: {
13
- flatten: boolean;
14
- }) => URI;
16
+ }, fragment: string, authority?: string, options?: Partial<typeof defaultOptions>) => URI;
15
17
  /**
16
18
  * Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
17
19
  */
@@ -31,8 +33,7 @@ export declare const generateResourceUri: (collectionName: ConfigCollectionName,
31
33
  [key: string]: any;
32
34
  name?: string;
33
35
  orgName: string;
34
- }, fragment: string, authority?: string, options?: {
35
- flatten: boolean;
36
- }) => URI;
36
+ }, fragment: string, authority?: string, options?: Partial<typeof defaultOptions>) => URI;
37
37
  export declare const generateOrgUri: (name: string, fragment: string, authority?: string) => URI;
38
38
  export declare const generateMachineUri: (name: string, fragment: string, authority?: string) => URI;
39
+ export {};
@@ -1,17 +1,19 @@
1
- import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {ConfigFragmentName,ConfigCollectionName}from'common/lib/generated/generated-models.js';import {flatten}from'./flatten-utils.js';function hasNestedObject(obj) {
1
+ import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {Scheme,ConfigFragmentName,ConfigCollectionName}from'common';import {flatten}from'./flatten-utils.js';function hasNestedObject(obj) {
2
2
  // Not an object or null? No nesting to worry about.
3
3
  if (typeof obj !== 'object' || obj === null) {
4
4
  return false;
5
5
  }
6
- // Treat arrays as acceptable—e.g., { alias: ["some"] } is fine.
6
+ // Treat arrays as acceptable
7
7
  if (Array.isArray(obj)) {
8
8
  return false;
9
9
  }
10
- // If any direct property is itself an object (and not an array), we have nesting.
11
- // For deeper checks, this could recurse further, but for now we only forbid
12
- // direct child objects. E.g. { name: { name: 'tet' } } triggers an error.
13
- return Object.values(obj).some(val => typeof val === 'object' && val !== null && !Array.isArray(val));
10
+ // Only consider it nested if any value is a non-null, non-array object
11
+ return Object.values(obj).some(val => val !== null && typeof val === 'object' && !Array.isArray(val) && !(val instanceof Date));
14
12
  }
13
+ const defaultOptions = {
14
+ flatten: false,
15
+ scheme: Scheme.MONGO_DB_FILE
16
+ };
15
17
  /**
16
18
  * Generate URI, it sorts the params in order to generate URI.
17
19
  * @param collectionName Schema Name to be used
@@ -19,18 +21,22 @@ import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from
19
21
  * @param fragment
20
22
  * @param authority
21
23
  */
22
- const generateUri = (collectionName, params, fragment, authority = '', options = {
23
- flatten: false
24
- }) => {
24
+ const generateUri = (collectionName, params, fragment, authority = '', options) => {
25
+ options = {
26
+ ...defaultOptions,
27
+ ...options
28
+ };
25
29
  // If we are NOT flattening, but detect nested objects, throw an error
26
30
  if (!options.flatten && hasNestedObject(params)) {
27
31
  throw new Error(`generateUri: "params: ${JSON.stringify(params)}" contains nested object(s), but "options.flatten" is false. Please flatten your data or enable flatten.`);
28
32
  }
33
+ console.log('---params---', params);
29
34
  params = options.flatten ? flatten(params) : params;
35
+ console.log('---params after flatten---', params);
30
36
  const orderedParams = sortKeys(params);
31
37
  const queryString$1 = queryString.stringify(orderedParams);
32
38
  return URI.file(`/${collectionName}`).with({
33
- scheme: Schemas.mongoDbFile,
39
+ scheme: options.scheme,
34
40
  authority,
35
41
  fragment,
36
42
  query: queryString$1
@@ -58,9 +64,7 @@ const generateUserUri = (params, fragment = ConfigFragmentName.Settings, authori
58
64
  const generateApplicationUri = (orgName, fragment = ConfigFragmentName.Settings, authority = '') => generateUri(ConfigCollectionName.Organizations, {
59
65
  orgName
60
66
  }, fragment, authority);
61
- const generateResourceUri = (collectionName, params, fragment, authority = '', options = {
62
- flatten: false
63
- }) => generateUri(collectionName, params, fragment, authority, options);
67
+ const generateResourceUri = (collectionName, params, fragment, authority = '', options) => generateUri(collectionName, params, fragment, authority, options);
64
68
  const generateOrgUri = (name, fragment, authority = '') => generateUri(ConfigCollectionName.Organizations, {
65
69
  name
66
70
  }, fragment, authority);
@@ -1 +1 @@
1
- {"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"oVAOA,SAAS,eAAe,CAAC,GAAQ,EAAA;;MAEzB,OAAA,QAAe,QAAA,OAAe,KAAA,IAAS,EAAA;AACvC,IAAA,OAAA;;;AAGJ,EAAA,IAAA,aAAU,CAAA,GAAW,CAAA,EAAC;AAClB,IAAA,OAAA;;;;;AAKJ,EAAA,OAAA,MAAa,CAAA,MAAO,CAAA,GAAI,CAAA,CAAA,IAAE,CAAA,GAAM,IAAG,OAAK,GAAA,KAAU,QAAa,IAAA,GAAA,KAAO,IAAK,IAAI,CAAI,KAAM,CAAA,OAAQ,CAAA,GAAA,CAAC,CAAG;AACzG;AACA;;;;;;AAMG;MACU,WAAW,GAAG,CACvB,cAAoC,EACpC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EACd,OAAO,GAAG;SAE4D,EAAA;MAClE;AACA;MAKH,CAAA,OAAA,CAAA,OAAA,IAAA,eAAA,CAAA,MAAA,CAAA,EAAA;AACD,IAAA,MAAM,IAAG,KAAA,CAAO,CAAC,wBAAwB,IAAI,UAAO,CAAA,MAAA,CAAA,CAAA,wGAAA,CAAA,CAAA;AACpD;QACM,GAAA,OAAA,CAAA,OAAyB,GAAA,OAAC,WAAU,MAAA;QAEnC,aAAS,GAAI,eAAgB,CAAA;QAChCA,aAAe,GAAAC,WAAY,CAAA,SAAA,CAAA,aAAA,CAAA;SAClB,GAAA,CAAA,IAAA,CAAA,CAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA,CAAA,IAAA,CAAA;UACD,EAAA,OAAA,CAAA,WAAA;AACR,IAAA,SAAK;AACR,IAAA,QAAE;AACP,IAAE,KAAA,EAAAD;AAEF,GAAA,CAAA;;AAEG;AACH;AAMA;;AAEG,EAAA,GAAA,EAAA;AACH,CAAA,EAAA,QAAa,EAAA,SAAA;AAKT;;;AAGC,MAAA,eAAA,GAAA,CAAA,MAAA,EAAA,QAAA,GAAA,kBAAA,CAAA,QAAA,EAAA,SAAA,GAAA,EAAA,KAAA;AACD,EAAA,IAAA,MAAkB,CAAA,SAAA,EAAqB;AAC3C,IAAE,MAAA,CAAA,KAAA,GAAA,CAAA,MAAA,CAAA,SAAA,CAAA;AAEF,IAAA,OAAA,MAAA,CAAA,SAAA;;AAEG,EAAA,OAAA,WAAA,CAAA,oBAAA,CAAA,QAAA,EAAA,MAAA,EAAA,QAAA,EAAA,SAAA,CAAA;AACH;AAGA;AAQA;AAGA;;;;;;;;;;;;"}
1
+ {"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"yPAOA,SAAS,eAAe,CAAC,GAAQ,EAAA;;MAEzB,OAAA,QAAe,QAAA,OAAe,KAAA,IAAS,EAAA;AACvC,IAAA,OAAA;;;AAGJ,EAAA,IAAA,aAAU,CAAA,GAAW,CAAA,EAAC;AAClB,IAAA,OAAA;;;AAGJ,EAAA,OAAA,aAAc,CAAA,GAAO,CAAA,CAAG,IAAE,CAAA,GACrB,IAAK,GAAE,KAAI,IAAK,IAAI,OAAI,GAAA,KAAU,YAAa,CAAI,KAAM,CAAA,WAAQ,CAAC,IAAI,EAAA,GAAK,gBAAgB,CAAI,CAAA;AAExG;AAEA,MAAM,cAAc,GAAG;AAEvB,EAAA,OAAA,EAAA,KAAA;;;;;;AAMG;AACH;;;AASgB,MAAA,WAAQ,GAAA,CAAI,gBAAgB,MAAM,EAAC,QAAG,EAAA,SAAA,GAAA,EAAA,EAAA,OAAA,KAAA;AAC9C,EAAA,OAAA,GAAA;IAKJ,GAAC,cAAA;AACD,IAAA,GAAA;AACA,GAAA;AACA;AACA,EAAA,IAAA,CAAA,mBAAsB,eAAe,CAAC,MAAC,CAAA,EAAA;IACvC,MAAM,IAAA,KAAA,CAAA,CAAW,wBAAwB,IAAC,CAAA,SAAa,CAAC,MAAC,CAAA,CAAA,wGAAA,CAAA,CAAA;;SAG/C,CAAA,GAAA,CAAA,cAAgB,EAAA,MAAA,CAAA;QACtB,GAAS,OAAA,CAAA,OAAA,GAAA,OAAA,CAAA,MAAA,CAAA,GAAA,MAAA;SACD,CAAA,GAAA,CAAA,4BAAA,EAAA,MAAA,CAAA;AACR,EAAA,MAAA,aAAkB,GAAA,QAAA,CAAA,MAAA,CAAA;AACrB,EAAA,MAAEA,aAAA,GAAAC,WAAA,CAAA,SAAA,CAAA,aAAA,CAAA;AACP,EAAE,OAAA,GAAA,CAAA,IAAA,CAAA,CAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA,CAAA,IAAA,CAAA;AAEF,IAAA,MAAA,EAAA,OAAA,CAAA,MAAA;;AAEG,IAAA,QAAA;AACH,IAAA,KAAO,EAAAD;AAMP,GAAA,CAAA;;AAEG;AACH;AAKI;AACmC,MAAA,oBAAiB,GAAA,CAAA,WAAW,EAAA,QAAA,GAAA,kBAAA,CAAA,QAAA,EAAA,SAAA,GAAA,EAAA,KAAA,WAAA,CAAA,oBAAA,CAAA,QAAA,EAAA;;WAE9D,EAAA,SAAA;AACD;AACJ;AAEA;;AAEG,EAAA,IAAA,MAAA,CAAA,SAAA,EAAA;AACH,IAAA,MAAO,CAAA,KAA4B,GAAA,CAAA,MAAA,CAAA,SAAA,CAAA;AAGnC,IAAA,OAAO,MAAyB,CAAA,SAAA;AAQhC;AAGA,EAAA,OAAO,WAAwB,CAAA,oBAAkB,CAAA,QAAkB,EAAA,MAAA,EAAS,QAAO,EAC/E,SAAA,CAAA;;;;;;;;;;;;;;"}
@@ -1,4 +1,4 @@
1
- import {ConfigurationContributionNames}from'common/lib/generated/generated-models.js';// not used anymore
1
+ import {ConfigurationContributionNames}from'common';// not used anymore
2
2
  const generateSettingsId = (target, nativeId = ConfigurationContributionNames.Settings) => {
3
3
  if (!nativeId) {
4
4
  nativeId = ConfigurationContributionNames.Settings;
@@ -1 +1 @@
1
- {"version":3,"file":"generated-settings-id.js","sources":["../../src/utils/generated-settings-id.ts"],"sourcesContent":[null],"names":[],"mappings":"sFAGA;AACO,MAAM,kBAAkB,GAAG,CAC9B,MAA2B,EAC3B,QAAA,GAAmB,8BAA8B,CAAC,QAAQ,KAC1D;MACI,CAAA,QAAS,EAAA;AACT,IAAA,QAAA,GAAA,8BAAW,CAAA,QAA+B;;AAE9C,EAAA,OAAA,CAAA,EAAU,QAAA,CAAA,CAAQ,EAAI,MAAA,CAAA,CAAM;AAChC"}
1
+ {"version":3,"file":"generated-settings-id.js","sources":["../../src/utils/generated-settings-id.ts"],"sourcesContent":[null],"names":[],"mappings":"oDAGA;AACO,MAAM,kBAAkB,GAAG,CAC9B,MAA2B,EAC3B,QAAA,GAAmB,8BAA8B,CAAC,QAAQ,KAC1D;MACI,CAAA,QAAS,EAAA;AACT,IAAA,QAAA,GAAA,8BAAW,CAAA,QAA+B;;AAE9C,EAAA,OAAA,CAAA,EAAU,QAAA,CAAA,CAAQ,EAAI,MAAA,CAAA,CAAM;AAChC"}
@@ -1,2 +1,2 @@
1
- import { AuthStrategy } from 'common/lib/generated/generated-models';
1
+ import { AuthStrategy } from 'common';
2
2
  export declare const getUserAlias: (alias: string[], strategy: AuthStrategy) => any;
@@ -1,4 +1,4 @@
1
- import {AuthStrategy}from'common/lib/generated/generated-models.js';const getUserAlias = (alias, strategy) => {
1
+ import {AuthStrategy}from'common';const getUserAlias = (alias, strategy) => {
2
2
  let id;
3
3
  if (strategy === AuthStrategy.Keycloak) {
4
4
  id = alias.find(x => x.includes(AuthStrategy.Keycloak));
@@ -1 +1 @@
1
- {"version":3,"file":"getUserAlias.js","sources":["../../src/utils/getUserAlias.ts"],"sourcesContent":[null],"names":[],"mappings":"0EAEa,YAAY,GAAG,CAAC,KAAe,EAAE,QAAsB,KAAI;AACpE,EAAA,IAAA,EAAI;AACJ,EAAA,IAAA,aAAiB,YAAA,CAAA,QAAa,EAAQ;AAClC,IAAA,EAAA,GAAA,KAAU,CAAA,IAAC,MAAM,CAAC,CAAE,qBAAc,CAAA,QAAqB,CAAA,CAAA;AACvD,IAAA,OAAA,EAAA,CAAA,KAAe,CAAA,CAAA,EAAA,YAAI,CAAA,QAAa,CAAA,CAAA,CAAA,CAAQ,CAAG,CAAA,CAAA;;IAE/C,GAAE,UAAS,CAAA,CAAI,KAAK,CAAE,CAAA,qBAAa,CAAA,QAAqB,CAAA,CAAA;AACxD,EAAA,OAAA,EAAO,CAAE,KAAM,CAAA,CAAA,EAAI,YAAA,CAAA,KAAa,CAAA,CAAK,CAAG,CAAA,CAAA,CAAC,CAAC;AAC9C"}
1
+ {"version":3,"file":"getUserAlias.js","sources":["../../src/utils/getUserAlias.ts"],"sourcesContent":[null],"names":[],"mappings":"wCAEa,YAAY,GAAG,CAAC,KAAe,EAAE,QAAsB,KAAI;AACpE,EAAA,IAAA,EAAI;AACJ,EAAA,IAAA,aAAiB,YAAA,CAAA,QAAa,EAAQ;AAClC,IAAA,EAAA,GAAA,KAAU,CAAA,IAAC,MAAM,CAAC,CAAE,qBAAc,CAAA,QAAqB,CAAA,CAAA;AACvD,IAAA,OAAA,EAAA,CAAA,KAAe,CAAA,CAAA,EAAA,YAAI,CAAA,QAAa,CAAA,CAAA,CAAA,CAAQ,CAAG,CAAA,CAAA;;IAE/C,GAAE,UAAS,CAAA,CAAI,KAAK,CAAE,CAAA,qBAAa,CAAA,QAAqB,CAAA,CAAA;AACxD,EAAA,OAAA,EAAO,CAAE,KAAM,CAAA,CAAA,EAAI,YAAA,CAAA,KAAa,CAAA,CAAK,CAAG,CAAA,CAAA,CAAC,CAAC;AAC9C"}
@@ -1,5 +1,4 @@
1
- import { IConfigurationNodeContextInput, RegistryExtensions, ConfigurationSchemaId } from 'common/lib/generated/generated-models.js';
2
- import { ServerContext } from 'common';
1
+ import { IConfigurationNodeContextInput, RegistryExtensions, ConfigurationSchemaId, ServerContext } from 'common';
3
2
  type UserContext = Pick<ServerContext['userContext'], 'userAlias' | 'orgId' | 'tenantId'>;
4
3
  export declare function buildNodeContext(userContext: UserContext, schemaId?: ConfigurationSchemaId, extensionName?: RegistryExtensions): IConfigurationNodeContextInput;
5
4
  export declare function buildPermissionNodeContext(userContext: UserContext): IConfigurationNodeContextInput;
@@ -1,4 +1,4 @@
1
- import {ConfigurationSchemaId,RegistryExtensions}from'common/lib/generated/generated-models.js';function buildNodeContext(userContext, schemaId = ConfigurationSchemaId.Configuration, extensionName = RegistryExtensions.DefaultConfiguration) {
1
+ import {ConfigurationSchemaId,RegistryExtensions}from'common';function buildNodeContext(userContext, schemaId = ConfigurationSchemaId.Configuration, extensionName = RegistryExtensions.DefaultConfiguration) {
2
2
  return {
3
3
  schemaId: schemaId,
4
4
  tenantId: userContext?.tenantId,
@@ -1 +1 @@
1
- {"version":3,"file":"nodeContext.js","sources":["../../src/utils/nodeContext.ts"],"sourcesContent":[null],"names":[],"mappings":"gGAQgB,SAAA,gBAAgB,CAC5B,WAAwB,EACxB,QAAQ,GAAG,qBAAqB,CAAC,aAAa,EAC9C,aAAoC,GAAA,kBAAkB,CAAC,oBAAoB,EAAA;SAEpE;AACH,IAAA,QAAA,EAAA,QAAkB;YACV,EAAA,WAAa,EAAA,QAAU;iBAClB;SACR,EAAA,WAAa,EAAA,KAAO;aAChB,EAAA,WAAa,EAAA;;AAE9B;AAEM,SAAU,0BAA0B,CAAC,WAAwB,EAAA;AAC/D,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,UAAW,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAClH;AACM,SAAU,sBAAsB,CAAC,WAAwB,EAAA;AAC3D,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,MAAO,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAC9G;AAEM,SAAU,oBAAoB,CAAC,WAAwB,EAAA;AACzD,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,QAAS,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAChH"}
1
+ {"version":3,"file":"nodeContext.js","sources":["../../src/utils/nodeContext.ts"],"sourcesContent":[null],"names":[],"mappings":"8DAGgB,SAAA,gBAAgB,CAC5B,WAAwB,EACxB,QAAQ,GAAG,qBAAqB,CAAC,aAAa,EAC9C,aAAoC,GAAA,kBAAkB,CAAC,oBAAoB,EAAA;SAEpE;AACH,IAAA,QAAA,EAAA,QAAkB;YACV,EAAA,WAAa,EAAA,QAAU;iBAClB;SACR,EAAA,WAAa,EAAA,KAAO;aAChB,EAAA,WAAa,EAAA;;AAE9B;AAEM,SAAU,0BAA0B,CAAC,WAAwB,EAAA;AAC/D,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,UAAW,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAClH;AACM,SAAU,sBAAsB,CAAC,WAAwB,EAAA;AAC3D,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,MAAO,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAC9G;AAEM,SAAU,oBAAoB,CAAC,WAAwB,EAAA;AACzD,EAAA,OAAA,gBAAuB,CAAA,WAAY,EAAA,qBAAuB,CAAA,QAAS,EAAA,kBAAoB,CAAA,oBAAqB,CAAA;AAChH"}
@@ -1,17 +1,17 @@
1
1
  import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
2
- import { IPreferencesOpenOptionsInput, ConfigurationTarget } from 'common/lib/generated/generated-models';
2
+ import { IPreferencesOpenOptionsInput, ConfigurationTarget } from 'common';
3
3
  export declare function getOpenSettings(target: ConfigurationTarget, resource: URI, options: IPreferencesOpenOptionsInput): {
4
4
  editableSettingsInput: URI;
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;
@@ -1,4 +1,4 @@
1
- import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {convertToResourceUri}from'./resourceUriConversion.js';import {ConfigurationContributionNames}from'common/lib/generated/generated-models.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']);
1
+ import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {convertToResourceUri}from'./resourceUriConversion.js';import {ConfigurationContributionNames}from'common';const KNOWN_SETTINGS_FILES = new Set(['settings.json', 'organizationSettings.json', 'resourceSettings.json', 'machineSettings.json', 'applicationSettings.json', 'organizationsettings.json', 'resourcesettings.json', 'machinesettings.json', 'applicationsettings.json']);
2
2
  function getOpenSettings(target, resource, options) {
3
3
  const editableSettingsResource = getEditableSettingsURI(resource, options);
4
4
  const mergedOptions = {
@@ -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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"}