@nordicsemiconductor/pc-nrfconnect-shared 198.0.0 → 200.0.0

package/scripts/nordic-publish.ts

@@ -107,18 +107,6 @@ class FtpClient extends Client {
             });
         });
 
-    createSourceDirectory = () =>
-        new Promise<void>((resolve, reject) => {
-            console.log(`Creating source directory ${this.sourceDir}`);
-            this.ftpClient.mkdir(this.sourceDir, true, err => {
-                if (err) {
-                    reject(new Error(`Failed to create source directory.`));
-                } else {
-                    resolve();
-                }
-            });
-        });
-
     changeWorkingDirectory = () =>
         new Promise<void>((resolve, reject) => {
             console.log(`Changing to directory ${this.sourceDir}`);
@@ -127,9 +115,7 @@ class FtpClient extends Client {
                     reject(
                         new Error(
                             '\nError: Failed to change to directory. ' +
-                                'Check whether it exists on the FTP server.\n' +
-                                'If you want to create a new source, use the ' +
-                                '--create-source option.'
+                                'Check whether it exists on the FTP server.'
                         )
                     );
                 } else {
@@ -140,9 +126,6 @@ class FtpClient extends Client {
 
     initialise = async () => {
         await this.connect();
-        if (this.options.doCreateSource) {
-            await this.createSourceDirectory();
-        }
         await this.changeWorkingDirectory();
     };
 
@@ -181,6 +164,7 @@ class ArtifactoryClient extends Client {
     token = process.env.ARTIFACTORY_TOKEN;
 
     sourceUrl: string;
+    uploadUrl: string;
 
     constructor(private readonly options: Options) {
         super();
@@ -191,7 +175,11 @@ class ArtifactoryClient extends Client {
             );
         }
 
-        this.sourceUrl = `https://files.nordicsemi.com/artifactory/swtools/${this.getAccessLevel()}/ncd/apps/${
+        this.uploadUrl = `https://files.nordicsemi.com/artifactory/swtools/${this.getAccessLevel()}/ncd/apps/${
+            options.source
+        }`;
+
+        this.sourceUrl = `https://files.nordicsemi.com/ui/api/v1/download?isNativeBrowsing=false&repoKey=swtools&path=${this.getAccessLevel()}/ncd/apps/${
             options.source
         }`;
     }
@@ -218,7 +206,7 @@ class ArtifactoryClient extends Client {
     };
 
     upload = async (content: Buffer, remoteFilename: string) => {
-        const url = `${this.sourceUrl}/${remoteFilename}`;
+        const url = `${this.uploadUrl}/${remoteFilename}`;
         const res = await fetch(url, {
             method: 'PUT',
             body: content,
@@ -287,7 +275,6 @@ const splitSourceAndAccessLevel = (sourceAndMaybeAccessLevel: string) => {
 
 interface Options {
     doPack: boolean;
-    doCreateSource: boolean;
     deployOfficial: boolean;
     source: string;
     sourceName?: string;
@@ -316,12 +303,6 @@ const parseOptions = (): Options => {
             '-n, --no-pack',
             'Publish existing .tgz file at the root directory without npm pack.'
         )
-        .option(
-            '--create-source <source name>',
-            'Do not fail if the source specifiec with --source does not yet ' +
-                'exist but instead create a new source with this name ' +
-                '(e.g. "Release Test").'
-        )
         .parse();
 
     const options = program.opts();
@@ -332,9 +313,7 @@ const parseOptions = (): Options => {
 
     return {
         doPack: options.pack,
-        doCreateSource: options.createSource != null,
         source,
-        sourceName: options.createSource,
         deployOfficial,
         destination: options.destination,
         accessLevel,
@@ -410,23 +389,6 @@ const assertAppVersionIsValid = (
     }
 };
 
-const createBlankSourceJson = async (name: string) => {
-    try {
-        await client.download('source.json');
-    } catch {
-        // Expected that the download throws an exception,
-        // because the file is supposed to not exist yet
-        return {
-            name,
-            apps: [],
-        };
-    }
-
-    throw new Error(
-        '`--create-source` given, but a `source.json` already exists on the server.'
-    );
-};
-
 const downloadSourceJson = async () => {
     let sourceJsonContent;
     try {
@@ -445,8 +407,7 @@ const downloadSourceJson = async () => {
 
         return sourceJson;
     } catch (error) {
-        const message =
-            'Unable to read `source.json` on the server. If you want to create a new source, use the option --create-source.\nError: ';
+        const message = 'Unable to read `source.json` on the server.\nError: ';
         const caughtError = errorAsString(error);
         const maybeSourceJsonContent =
             sourceJsonContent == null
@@ -457,15 +418,10 @@ const downloadSourceJson = async () => {
     }
 };
 
-const getUpdatedSourceJson = async (
-    app: App,
-    options: Options
-): Promise<SourceJson> => {
-    const sourceJson = await (options.doCreateSource
-        ? createBlankSourceJson(options.sourceName!) // eslint-disable-line @typescript-eslint/no-non-null-assertion -- Can never be null because of the control flow
-        : downloadSourceJson());
+const getUpdatedSourceJson = async (app: App): Promise<SourceJson> => {
+    const sourceJson = await downloadSourceJson();
     return {
-        name: sourceJson.name,
+        ...sourceJson,
         apps: [
             ...new Set(sourceJson.apps).add(
                 `${app.sourceUrl}/${app.appInfoName}`
@@ -495,13 +451,8 @@ const failBecauseOfMissingProperty = () => {
     );
 };
 
-const getUpdatedAppInfo = async (
-    app: App,
-    options: Options
-): Promise<AppInfo> => {
-    const oldAppInfo = options.doCreateSource
-        ? {}
-        : await downloadExistingAppInfo(app);
+const getUpdatedAppInfo = async (app: App): Promise<AppInfo> => {
+    const oldAppInfo = await downloadExistingAppInfo(app);
 
     assertAppVersionIsValid(oldAppInfo.latestVersion, app);
 
@@ -588,8 +539,8 @@ const main = async () => {
 
         await client.initialise(options);
 
-        const sourceJson = await getUpdatedSourceJson(app, options);
-        const appInfo = await getUpdatedAppInfo(app, options);
+        const sourceJson = await getUpdatedSourceJson(app);
+        const appInfo = await getUpdatedAppInfo(app);
 
         await uploadChangelog(app);
         await uploadIcon(app);

package/typings/generated/ipc/MetaFiles.d.ts

@@ -2,13 +2,16 @@ import { z } from 'zod';
 export type UrlString = string;
 export declare const sourceJsonSchema: z.ZodObject<{
     name: z.ZodString;
+    description: z.ZodOptional<z.ZodString>;
     apps: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     name: string;
     apps: string[];
+    description?: string | undefined;
 }, {
     name: string;
     apps: string[];
+    description?: string | undefined;
 }>;
 export type SourceJson = z.infer<typeof sourceJsonSchema>;
 export declare const withdrawnJsonSchema: z.ZodArray<z.ZodString, "many">;

package/typings/generated/ipc/MetaFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,mBAAmB,iCAA4B,CAAC;AAC7D,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CACL;AAED,eAAO,MAAM,MAAM,aAIlB,CAAC;AAEF,QAAA,MAAM,iBAAiB,aAAa,CAAC;AACrC,QAAA,MAAM,oBAAoB,aAAS,CAAC;AAEpC,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAClE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,eAAO,MAAM,UAAU,2DAAiD,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC"}
+{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAI3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,eAAO,MAAM,mBAAmB,iCAA4B,CAAC;AAC7D,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;CACL;AAED,eAAO,MAAM,MAAM,aAIlB,CAAC;AAEF,QAAA,MAAM,iBAAiB,aAAa,CAAC;AACrC,QAAA,MAAM,oBAAoB,aAAS,CAAC;AAEpC,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAClE,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,eAAO,MAAM,UAAU,2DAAiD,CAAC;AAEzE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC"}

package/typings/generated/ipc/schema/packageJson.d.ts

@@ -66,9 +66,9 @@ declare const packageJsonApp: z.ZodObject<z.objectUtil.extendShape<{
     }>>;
 }>, "strip", z.ZodTypeAny, {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -88,9 +88,9 @@ declare const packageJsonApp: z.ZodObject<z.objectUtil.extendShape<{
     } | undefined;
 }, {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -112,9 +112,9 @@ declare const packageJsonApp: z.ZodObject<z.objectUtil.extendShape<{
 export type PackageJsonApp = z.infer<typeof packageJsonApp>;
 export declare const parsePackageJsonApp: (content: string) => z.SafeParseSuccess<{
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -195,9 +195,9 @@ declare const packageJsonLegacyApp: z.ZodObject<z.objectUtil.extendShape<z.objec
     }>>;
 }>, "strip", z.ZodTypeAny, {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -217,9 +217,9 @@ declare const packageJsonLegacyApp: z.ZodObject<z.objectUtil.extendShape<z.objec
     } | undefined;
 }, {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -241,9 +241,9 @@ declare const packageJsonLegacyApp: z.ZodObject<z.objectUtil.extendShape<z.objec
 export type PackageJsonLegacyApp = z.infer<typeof packageJsonLegacyApp>;
 export declare const parsePackageJsonLegacyApp: (content: string) => z.SafeParseSuccess<{
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };

package/typings/generated/scripts/create-source.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env ts-node
+export {};
+//# sourceMappingURL=create-source.d.ts.map

package/typings/generated/scripts/create-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-source.d.ts","sourceRoot":"","sources":["../../../scripts/create-source.ts"],"names":[],"mappings":""}

package/typings/generated/src/utils/packageJson.d.ts

@@ -5,9 +5,9 @@ export declare const isLauncher: (packageJson?: {
     displayName?: string | undefined;
 } | {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };
@@ -29,9 +29,9 @@ export declare const isLauncher: (packageJson?: {
 export declare const packageJson: () => PackageJson | PackageJsonApp;
 export declare const packageJsonApp: () => {
     name: string;
+    description: string;
     version: string;
     displayName: string;
-    description: string;
     engines: Record<string, string | undefined> & {
         nrfconnect: string;
     };