@azure-tools/typespec-ts 0.54.0-alpha.20260601.2 → 0.54.0-dev.4
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.
- package/CHANGELOG.md +0 -11
- package/README.md +0 -4
- package/dist/src/contextManager.js +3 -3
- package/dist/src/contextManager.js.map +1 -1
- package/dist/src/framework/hooks/binder.js +19 -20
- package/dist/src/framework/hooks/binder.js.map +1 -1
- package/dist/src/framework/hooks/sdkTypes.js +1 -2
- package/dist/src/framework/hooks/sdkTypes.js.map +1 -1
- package/dist/src/framework/load-static-helpers.js +7 -8
- package/dist/src/framework/load-static-helpers.js.map +1 -1
- package/dist/src/framework/reference.js +1 -1
- package/dist/src/framework/reference.js.map +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +34 -45
- package/dist/src/index.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +14 -15
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.js +4 -3
- package/dist/src/modular/buildClassicalOperationGroups.js.map +1 -1
- package/dist/src/modular/buildClientContext.js +1 -2
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildModularOptions.js +4 -5
- package/dist/src/modular/buildModularOptions.js.map +1 -1
- package/dist/src/modular/buildOperations.js +1 -2
- package/dist/src/modular/buildOperations.js.map +1 -1
- package/dist/src/modular/buildProjectFiles.js +1 -2
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/buildRestorePoller.js +1 -2
- package/dist/src/modular/buildRestorePoller.js.map +1 -1
- package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
- package/dist/src/modular/buildRootIndex.js +9 -14
- package/dist/src/modular/buildRootIndex.js.map +1 -1
- package/dist/src/modular/buildSubpathIndex.js +1 -2
- package/dist/src/modular/buildSubpathIndex.js.map +1 -1
- package/dist/src/modular/emitLoggerFile.js +2 -2
- package/dist/src/modular/emitLoggerFile.js.map +1 -1
- package/dist/src/modular/emitModels.js +32 -46
- package/dist/src/modular/emitModels.js.map +1 -1
- package/dist/src/modular/emitModelsOptions.js +1 -1
- package/dist/src/modular/emitModelsOptions.js.map +1 -1
- package/dist/src/modular/emitSamples.js +34 -30
- package/dist/src/modular/emitSamples.js.map +1 -1
- package/dist/src/modular/emitTests.js +4 -6
- package/dist/src/modular/emitTests.js.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.js +42 -42
- package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.js +20 -25
- package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
- package/dist/src/modular/helpers/clientOptionHelpers.js +1 -1
- package/dist/src/modular/helpers/clientOptionHelpers.js.map +1 -1
- package/dist/src/modular/helpers/exampleValueHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/exampleValueHelpers.js +39 -32
- package/dist/src/modular/helpers/exampleValueHelpers.js.map +1 -1
- package/dist/src/modular/helpers/namingHelpers.js +3 -5
- package/dist/src/modular/helpers/namingHelpers.js.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.js +75 -99
- package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.js +3 -5
- package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
- package/dist/src/modular/serialization/buildDeserializerFunction.js +11 -14
- package/dist/src/modular/serialization/buildDeserializerFunction.js.map +1 -1
- package/dist/src/modular/serialization/buildSerializerFunction.js +17 -20
- package/dist/src/modular/serialization/buildSerializerFunction.js.map +1 -1
- package/dist/src/modular/serialization/buildXmlSerializerFunction.js +31 -40
- package/dist/src/modular/serialization/buildXmlSerializerFunction.js.map +1 -1
- package/dist/src/modular/serialization/serializeUtils.d.ts.map +1 -1
- package/dist/src/modular/serialization/serializeUtils.js +24 -25
- package/dist/src/modular/serialization/serializeUtils.js.map +1 -1
- package/dist/src/modular/type-expressions/get-enum-expression.js +1 -2
- package/dist/src/modular/type-expressions/get-enum-expression.js.map +1 -1
- package/dist/src/modular/type-expressions/get-model-expression.js +5 -6
- package/dist/src/modular/type-expressions/get-model-expression.js.map +1 -1
- package/dist/src/modular/type-expressions/get-nullable-expression.js +2 -3
- package/dist/src/modular/type-expressions/get-nullable-expression.js.map +1 -1
- package/dist/src/modular/type-expressions/get-type-expression.js +2 -4
- package/dist/src/modular/type-expressions/get-type-expression.js.map +1 -1
- package/dist/src/rlc-common/buildClient.js +26 -30
- package/dist/src/rlc-common/buildClient.js.map +1 -1
- package/dist/src/rlc-common/buildClientDefinitions.js +6 -5
- package/dist/src/rlc-common/buildClientDefinitions.js.map +1 -1
- package/dist/src/rlc-common/buildIndexFile.js +2 -3
- package/dist/src/rlc-common/buildIndexFile.js.map +1 -1
- package/dist/src/rlc-common/buildIsUnexpectedHelper.js +12 -10
- package/dist/src/rlc-common/buildIsUnexpectedHelper.js.map +1 -1
- package/dist/src/rlc-common/buildLogger.js +1 -2
- package/dist/src/rlc-common/buildLogger.js.map +1 -1
- package/dist/src/rlc-common/buildMethodShortcuts.js +1 -1
- package/dist/src/rlc-common/buildMethodShortcuts.js.map +1 -1
- package/dist/src/rlc-common/buildObjectTypes.js +38 -60
- package/dist/src/rlc-common/buildObjectTypes.js.map +1 -1
- package/dist/src/rlc-common/buildParameterTypes.js +12 -15
- package/dist/src/rlc-common/buildParameterTypes.js.map +1 -1
- package/dist/src/rlc-common/buildPollingHelper.js +7 -8
- package/dist/src/rlc-common/buildPollingHelper.js.map +1 -1
- package/dist/src/rlc-common/buildResponseTypes.js +4 -5
- package/dist/src/rlc-common/buildResponseTypes.js.map +1 -1
- package/dist/src/rlc-common/helpers/apiVersionUtil.js +5 -6
- package/dist/src/rlc-common/helpers/apiVersionUtil.js.map +1 -1
- package/dist/src/rlc-common/helpers/importsUtil.js +9 -12
- package/dist/src/rlc-common/helpers/importsUtil.js.map +1 -1
- package/dist/src/rlc-common/helpers/nameConstructors.js +2 -4
- package/dist/src/rlc-common/helpers/nameConstructors.js.map +1 -1
- package/dist/src/rlc-common/helpers/nameUtils.js +9 -10
- package/dist/src/rlc-common/helpers/nameUtils.js.map +1 -1
- package/dist/src/rlc-common/helpers/operationHelpers.js +10 -21
- package/dist/src/rlc-common/helpers/operationHelpers.js.map +1 -1
- package/dist/src/rlc-common/helpers/packageUtil.js +3 -6
- package/dist/src/rlc-common/helpers/packageUtil.js.map +1 -1
- package/dist/src/rlc-common/helpers/schemaHelpers.js +2 -6
- package/dist/src/rlc-common/helpers/schemaHelpers.js.map +1 -1
- package/dist/src/rlc-common/helpers/typeUtil.js +4 -8
- package/dist/src/rlc-common/helpers/typeUtil.js.map +1 -1
- package/dist/src/rlc-common/helpers/valueGenerationUtil.js +4 -7
- package/dist/src/rlc-common/helpers/valueGenerationUtil.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildApiExtractorConfig.js +2 -3
- package/dist/src/rlc-common/metadata/buildApiExtractorConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildChangelogFile.js +1 -2
- package/dist/src/rlc-common/metadata/buildChangelogFile.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildESLintConfig.js +3 -4
- package/dist/src/rlc-common/metadata/buildESLintConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildPackageFile.js +19 -23
- package/dist/src/rlc-common/metadata/buildPackageFile.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildReadmeFile.js +25 -25
- package/dist/src/rlc-common/metadata/buildReadmeFile.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildRollupConfig.js +1 -2
- package/dist/src/rlc-common/metadata/buildRollupConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildSampleEnvFile.js +3 -4
- package/dist/src/rlc-common/metadata/buildSampleEnvFile.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildTestConfig.js +3 -4
- package/dist/src/rlc-common/metadata/buildTestConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildTsConfig.js +6 -8
- package/dist/src/rlc-common/metadata/buildTsConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildVitestConfig.js +2 -3
- package/dist/src/rlc-common/metadata/buildVitestConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/buildWarpConfig.js +2 -3
- package/dist/src/rlc-common/metadata/buildWarpConfig.js.map +1 -1
- package/dist/src/rlc-common/metadata/packageJson/azurePackageCommon.js +1 -1
- package/dist/src/rlc-common/metadata/packageJson/azurePackageCommon.js.map +1 -1
- package/dist/src/rlc-common/metadata/packageJson/buildAzureMonorepoPackage.js +2 -3
- package/dist/src/rlc-common/metadata/packageJson/buildAzureMonorepoPackage.js.map +1 -1
- package/dist/src/rlc-common/metadata/packageJson/packageCommon.js +2 -2
- package/dist/src/rlc-common/metadata/packageJson/packageCommon.js.map +1 -1
- package/dist/src/rlc-common/metadata/utils.js +1 -2
- package/dist/src/rlc-common/metadata/utils.js.map +1 -1
- package/dist/src/rlc-common/test/buildRecordedClient.js +2 -3
- package/dist/src/rlc-common/test/buildRecordedClient.js.map +1 -1
- package/dist/src/rlc-common/test/buildSampleTest.js +2 -3
- package/dist/src/rlc-common/test/buildSampleTest.js.map +1 -1
- package/dist/src/rlc-common/test/buildSnippets.js +4 -5
- package/dist/src/rlc-common/test/buildSnippets.js.map +1 -1
- package/dist/src/rlc-common/transformSampleGroups.js +23 -23
- package/dist/src/rlc-common/transformSampleGroups.js.map +1 -1
- package/dist/src/transform/transform.js +20 -18
- package/dist/src/transform/transform.js.map +1 -1
- package/dist/src/transform/transformApiVersionInfo.js +7 -7
- package/dist/src/transform/transformApiVersionInfo.js.map +1 -1
- package/dist/src/transform/transformHelperFunctionDetails.js +2 -3
- package/dist/src/transform/transformHelperFunctionDetails.js.map +1 -1
- package/dist/src/transform/transformParameters.js +15 -22
- package/dist/src/transform/transformParameters.js.map +1 -1
- package/dist/src/transform/transformPaths.js +9 -12
- package/dist/src/transform/transformPaths.js.map +1 -1
- package/dist/src/transform/transformResponses.js +10 -14
- package/dist/src/transform/transformResponses.js.map +1 -1
- package/dist/src/transform/transformSchemas.js +17 -22
- package/dist/src/transform/transformSchemas.js.map +1 -1
- package/dist/src/transform/transfromRLCOptions.js +23 -22
- package/dist/src/transform/transfromRLCOptions.js.map +1 -1
- package/dist/src/utils/clientUtils.js +6 -11
- package/dist/src/utils/clientUtils.js.map +1 -1
- package/dist/src/utils/credentialUtils.js +1 -2
- package/dist/src/utils/credentialUtils.js.map +1 -1
- package/dist/src/utils/crossLanguageDef.js +6 -6
- package/dist/src/utils/crossLanguageDef.js.map +1 -1
- package/dist/src/utils/emitUtil.js +1 -1
- package/dist/src/utils/emitUtil.js.map +1 -1
- package/dist/src/utils/fileSystemUtils.d.ts +2 -0
- package/dist/src/utils/fileSystemUtils.d.ts.map +1 -1
- package/dist/src/utils/fileSystemUtils.js +24 -5
- package/dist/src/utils/fileSystemUtils.js.map +1 -1
- package/dist/src/utils/importHelper.js +1 -2
- package/dist/src/utils/importHelper.js.map +1 -1
- package/dist/src/utils/modelUtils.js +78 -104
- package/dist/src/utils/modelUtils.js.map +1 -1
- package/dist/src/utils/namespaceUtils.js +4 -5
- package/dist/src/utils/namespaceUtils.js.map +1 -1
- package/dist/src/utils/operationUtil.js +38 -46
- package/dist/src/utils/operationUtil.js.map +1 -1
- package/dist/src/utils/parameterUtils.js +7 -11
- package/dist/src/utils/parameterUtils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +38 -41
- package/src/index.ts +11 -10
- package/src/modular/buildRootIndex.ts +0 -1
- package/src/modular/emitSamples.ts +1 -3
- package/src/modular/helpers/exampleValueHelpers.ts +2 -6
- package/src/modular/serialization/serializeUtils.ts +0 -1
- package/src/rlc-common/buildClientDefinitions.ts +1 -0
- package/src/utils/fileSystemUtils.ts +29 -5
- package/static/static-helpers/pollingHelpers.ts +3 -3
- package/static/static-helpers/serialization/get-binary-response-browser.mts +3 -1
- package/static/static-helpers/serialization/get-binary-stream-response-browser.mts +1 -3
- package/static/static-helpers/serialization/xml-helpers.ts +1 -1
- package/static/static-helpers/simplePollerHelpers.ts +1 -1
|
@@ -5,12 +5,11 @@ import { getMethodHierarchiesMap } from "./operationUtil.js";
|
|
|
5
5
|
import { NameType, normalizeName } from "../rlc-common/index.js";
|
|
6
6
|
import { UsageFlags } from "@azure-tools/typespec-client-generator-core";
|
|
7
7
|
export function generateCrossLanguageDefinitionFile(dpgContext) {
|
|
8
|
-
|
|
9
|
-
const modularSourcesRoot = (_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.modularSourcesDir) !== null && _b !== void 0 ? _b : "src";
|
|
8
|
+
const modularSourcesRoot = dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
|
|
10
9
|
const emitterOptions = transformModularEmitterOptions(dpgContext, modularSourcesRoot, {
|
|
11
10
|
casing: "camel"
|
|
12
11
|
});
|
|
13
|
-
const packageName =
|
|
12
|
+
const packageName = emitterOptions.options?.packageDetails?.name ?? "package-name";
|
|
14
13
|
const CrossLanguageDefinitionId = {};
|
|
15
14
|
for (const model of dpgContext.sdkPackage.models) {
|
|
16
15
|
CrossLanguageDefinitionId[`${packageName}!${model.name}:interface`] =
|
|
@@ -18,7 +17,7 @@ export function generateCrossLanguageDefinitionFile(dpgContext) {
|
|
|
18
17
|
}
|
|
19
18
|
for (const enm of dpgContext.sdkPackage.enums) {
|
|
20
19
|
// Skip api version enum for multi-service scenarios since each service may have different versions
|
|
21
|
-
if (
|
|
20
|
+
if (dpgContext.rlcOptions?.isMultiService &&
|
|
22
21
|
enm.usage === UsageFlags.ApiVersionEnum) {
|
|
23
22
|
continue;
|
|
24
23
|
}
|
|
@@ -30,7 +29,8 @@ export function generateCrossLanguageDefinitionFile(dpgContext) {
|
|
|
30
29
|
union.crossLanguageDefinitionId;
|
|
31
30
|
}
|
|
32
31
|
for (const subClient of dpgContext.sdkPackage.clients) {
|
|
33
|
-
const clientName =
|
|
32
|
+
const clientName = emitterOptions.options?.typespecTitleMap?.[subClient.name] ??
|
|
33
|
+
subClient.name;
|
|
34
34
|
const methodMap = getMethodHierarchiesMap(dpgContext, subClient);
|
|
35
35
|
for (const [prefixKey, operations] of methodMap) {
|
|
36
36
|
const prefixes = prefixKey.split("/");
|
|
@@ -44,7 +44,7 @@ export function generateCrossLanguageDefinitionFile(dpgContext) {
|
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
46
46
|
// e,g., @azure/ai-client!ConnectionsOperations#getConnectionWithSecrets:member": "Azure.AI.Projects.Connections.getConnectionWithSecrets"
|
|
47
|
-
const rawGroupName = normalizeName(
|
|
47
|
+
const rawGroupName = normalizeName(prefixes[0] ?? "", NameType.Interface);
|
|
48
48
|
const propertyType = `${normalizeName(rawGroupName, NameType.OperationGroup)}Operations`;
|
|
49
49
|
for (const operation of operations) {
|
|
50
50
|
const { name } = operation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossLanguageDef.js","sourceRoot":"","sources":["../../../src/utils/crossLanguageDef.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,EAAE,8BAA8B,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAEzE,MAAM,UAAU,mCAAmC,CAAC,UAAsB
|
|
1
|
+
{"version":3,"file":"crossLanguageDef.js","sourceRoot":"","sources":["../../../src/utils/crossLanguageDef.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ async function emitFile(file, program, isAzureFlavor, emitterOutputDir) {
|
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
41
|
const host = program.host;
|
|
42
|
-
const filePath = join(emitterOutputDir
|
|
42
|
+
const filePath = join(emitterOutputDir ?? "", file.path);
|
|
43
43
|
const isJson = /\.json$/gi.test(filePath);
|
|
44
44
|
const isSourceCode = /\.(ts|js)$/gi.test(filePath);
|
|
45
45
|
const microsoftHeader = isAzureFlavor
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitUtil.js","sourceRoot":"","sources":["../../../src/utils/emitUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAGhB,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAyB,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,WAAW,CAAC;AAEnB,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAAmB,EAAE,OAAgB;IACpE,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;QACzD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,QAAQ,CAAC,cAAc,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,QAAQ,CAAC,eAAe,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAAgB,EAChB,eAAkD,EAClD,SAAmB,EACnB,gBAAyB;IAEzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QACpC,eAAe,GAAG,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,aAAa,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAChD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,IAAI,YAAY,GAA8B,SAAS,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,YAAY,GAAG,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CACrB,IAAU,EACV,OAAgB,EAChB,aAAsB,EACtB,gBAAyB;IAEzB,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;QACzD,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"emitUtil.js","sourceRoot":"","sources":["../../../src/utils/emitUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { Program } from "@typespec/compiler";
|
|
2
|
+
export declare function pathExists(targetPath: string): Promise<boolean>;
|
|
3
|
+
export declare function emptyDir(dirPath: string): Promise<void>;
|
|
2
4
|
export declare function clearDirectory(dirPath: string, excludeNames?: string[], program?: Program): Promise<void>;
|
|
3
5
|
//# sourceMappingURL=fileSystemUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileSystemUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/fileSystemUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fileSystemUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/fileSystemUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAGvD,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAc7D;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,MAAM,EAAO,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC,CAoCf"}
|
|
@@ -1,15 +1,34 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { readdir, rm } from "fs/promises";
|
|
1
|
+
import { mkdir, readdir, rm, stat } from "fs/promises";
|
|
3
2
|
import { resolve } from "path";
|
|
4
3
|
import { NoTarget } from "@typespec/compiler";
|
|
5
4
|
import { reportDiagnostic } from "../lib.js";
|
|
5
|
+
export async function pathExists(targetPath) {
|
|
6
|
+
try {
|
|
7
|
+
await stat(targetPath);
|
|
8
|
+
return true;
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
return false;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
export async function emptyDir(dirPath) {
|
|
15
|
+
let entries;
|
|
16
|
+
try {
|
|
17
|
+
entries = await readdir(dirPath);
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
await mkdir(dirPath, { recursive: true });
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
await Promise.all(entries.map((entry) => rm(resolve(dirPath, entry), { recursive: true, force: true })));
|
|
24
|
+
}
|
|
6
25
|
export async function clearDirectory(dirPath, excludeNames = [], program) {
|
|
7
|
-
if (!(await
|
|
26
|
+
if (!(await pathExists(dirPath))) {
|
|
8
27
|
return;
|
|
9
28
|
}
|
|
10
29
|
// If no exclude names, just use regular emptyDir for efficiency
|
|
11
30
|
if (excludeNames.length === 0) {
|
|
12
|
-
await
|
|
31
|
+
await emptyDir(dirPath);
|
|
13
32
|
return;
|
|
14
33
|
}
|
|
15
34
|
try {
|
|
@@ -34,7 +53,7 @@ export async function clearDirectory(dirPath, excludeNames = [], program) {
|
|
|
34
53
|
target: NoTarget
|
|
35
54
|
});
|
|
36
55
|
}
|
|
37
|
-
await
|
|
56
|
+
await emptyDir(dirPath);
|
|
38
57
|
}
|
|
39
58
|
}
|
|
40
59
|
//# sourceMappingURL=fileSystemUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileSystemUtils.js","sourceRoot":"","sources":["../../../src/utils/fileSystemUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"fileSystemUtils.js","sourceRoot":"","sources":["../../../src/utils/fileSystemUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAW,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,UAAkB;IACjD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAe;IAC5C,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAC9D,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,eAAyB,EAAE,EAC3B,OAAiB;IAEjB,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,gEAAgE;IAChE,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,mCAAmC;QACnC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvC,2DAA2D;QAC3D,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,qBAAqB;QACrB,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACpC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,qDAAqD;QACrD,IAAI,OAAO,EAAE,CAAC;YACZ,gBAAgB,CAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,2BAA2B;gBACjC,MAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;gBACpD,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC"}
|
|
@@ -8,11 +8,10 @@ import { useContext } from "../contextManager.js";
|
|
|
8
8
|
* @param {SourceFile} currentFile The ts-morph SourceFile object where the import will be added.
|
|
9
9
|
*/
|
|
10
10
|
export function addImportBySymbol(symbol, currentFile) {
|
|
11
|
-
var _a;
|
|
12
11
|
// Retrieve the global map of symbols to their source files.
|
|
13
12
|
const symbolMap = useContext("symbolMap");
|
|
14
13
|
// Attempt to resolve the file path for the given symbol.
|
|
15
|
-
const modulePath =
|
|
14
|
+
const modulePath = symbolMap.get(symbol)?.getFilePath();
|
|
16
15
|
if (!modulePath) {
|
|
17
16
|
return;
|
|
18
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importHelper.js","sourceRoot":"","sources":["../../../src/utils/importHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAc,EAAE,WAAuB
|
|
1
|
+
{"version":3,"file":"importHelper.js","sourceRoot":"","sources":["../../../src/utils/importHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAc,EAAE,WAAuB;IACvE,4DAA4D;IAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IAE1C,yDAAyD;IACzD,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;IACxD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,yFAAyF;IACzF,MAAM,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,kBAAkB,GAAG,qBAAqB,CAC9C,WAAW,CAAC,WAAW,EAAE,EACzB,kBAAkB,CACnB;SACE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE3B,gFAAgF;IAChF,MAAM,QAAQ,GAAG,WAAW,CAAC,oBAAoB,CAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,EAAE,KAAK,kBAAkB,CAC1D,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,QAAQ;aACxB,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC,CAAC;QAEvC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,oBAAoB,CAAC;YAC/B,eAAe,EAAE,kBAAkB;YACnC,YAAY,EAAE,CAAC,MAAM,CAAC;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,qBAAqB,CAAC,IAAY,EAAE,EAAU;IACrD,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACjD,qDAAqD;IACrD,OAAO,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,YAAY,CAAC;AAC3E,CAAC"}
|