@dcl/sdk-commands 7.1.4-4619276636.commit-e2c17cb → 7.1.4-4622328580.commit-fe88e6c

package/dist/commands/build/index.d.ts

@@ -1,14 +1,11 @@
 import { CliComponents } from '../../components';
 import { SceneProject } from '../../logic/project-validations';
+import { Result } from 'arg';
 interface Options {
-    args: typeof args;
+    args: Result<typeof args>;
     components: Pick<CliComponents, 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
-export declare const args: import("arg").Result<{
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-} & {
+export declare const args: {
     '--watch': BooleanConstructor;
     '-w': string;
     '--production': BooleanConstructor;
@@ -17,8 +14,8 @@ export declare const args: import("arg").Result<{
     '-p': string;
     '--skip-install': BooleanConstructor;
     '--dir': StringConstructor;
-}>;
-export declare function help(): string;
+};
+export declare function help(options: Options): void;
 export declare function main(options: Options): Promise<void>;
 export declare function buildScene(options: Options, project: SceneProject): Promise<void>;
 export {};

package/dist/commands/build/index.js

@@ -12,7 +12,7 @@ const project_files_1 = require("../../logic/project-files");
 const bundle_1 = require("../../logic/bundle");
 const beautiful_logs_1 = require("../../logic/beautiful-logs");
 const workspace_validations_1 = require("../../logic/workspace-validations");
-exports.args = (0, args_1.getArgs)({
+exports.args = (0, args_1.declareArgs)({
     '--watch': Boolean,
     '-w': '--watch',
     '--production': Boolean,
@@ -22,8 +22,8 @@ exports.args = (0, args_1.getArgs)({
     '--skip-install': Boolean,
     '--dir': String
 });
-function help() {
-    return `
+function help(options) {
+    options.components.logger.log(`
   Usage: 'sdk-commands build [options]'
     Options:'
       -h, --help                Displays complete help
@@ -35,7 +35,7 @@ function help() {
     Example:
     - Build your scene:
       '$ sdk-commands build'
-  `;
+  `);
 }
 exports.help = help;
 async function main(options) {
@@ -66,8 +66,7 @@ async function buildScene(options, project) {
     options.components.analytics.track('Build scene', {
         projectHash: await (0, project_files_1.b64HashingFunction)(project.workingDirectory),
         coords,
-        isWorkspace: false,
-        args: (0, args_1.getArgsUsed)(options.args)
+        isWorkspace: false
     });
 }
 exports.buildScene = buildScene;

package/dist/commands/deploy/index.d.ts

@@ -1,13 +1,10 @@
 import { CliComponents } from '../../components';
+import { Result } from 'arg';
 interface Options {
-    args: typeof args;
+    args: Result<typeof args>;
     components: CliComponents;
 }
-export declare const args: import("arg").Result<{
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-} & {
+export declare const args: {
     '--dir': StringConstructor;
     '--help': BooleanConstructor;
     '-h': string;
@@ -25,7 +22,7 @@ export declare const args: import("arg").Result<{
     '-b': string;
     '--port': NumberConstructor;
     '-p': string;
-}>;
-export declare function help(): string;
+};
+export declare function help(options: Options): void;
 export declare function main(options: Options): Promise<void>;
 export {};

package/dist/commands/deploy/index.js

@@ -15,7 +15,7 @@ const error_1 = require("../../logic/error");
 const beautiful_logs_1 = require("../../logic/beautiful-logs");
 const account_1 = require("../../logic/account");
 const project_files_1 = require("../../logic/project-files");
-exports.args = (0, args_1.getArgs)({
+exports.args = (0, args_1.declareArgs)({
     '--dir': String,
     '--help': Boolean,
     '-h': '--help',
@@ -34,8 +34,8 @@ exports.args = (0, args_1.getArgs)({
     '--port': Number,
     '-p': '--port'
 });
-function help() {
-    return `
+function help(options) {
+    options.components.logger.log(`
   Usage: 'sdk-commands build [options]'
     Options:
       -h, --help                Displays complete help
@@ -52,7 +52,7 @@ function help() {
       $ sdk-commands deploy
     - Deploy your scene to a specific content server:
       $ sdk-commands deploy --target my-favorite-catalyst-server.org:2323
-`;
+`);
 }
 exports.help = help;
 async function main(options) {
@@ -69,8 +69,7 @@ async function main(options) {
     const trackProps = {
         projectHash: await (0, project_files_1.b64HashingFunction)(projectRoot),
         coords,
-        isWorld,
-        args: (0, args_1.getArgsUsed)(options.args)
+        isWorld
     };
     const packageJson = await (0, project_files_1.getPackageJson)(options.components, projectRoot);
     const dependencies = Array.from(new Set([...Object.keys(packageJson.dependencies || {}), ...Object.keys(packageJson.devDependencies || {})]));

package/dist/commands/deploy/linker-dapp/api.js

@@ -18,7 +18,7 @@ const routes_1 = require("./routes");
 const config_1 = require("../../../logic/config");
 function runLinkerApp(cliComponents, scene, files, port, rootCID, { isHttps, skipValidations, openBrowser }) {
     return new Promise(async (resolve) => {
-        const resolvedPort = await (0, get_free_port_1.getPort)(port, 4044);
+        const resolvedPort = await (0, get_free_port_1.getPort)(port);
         const sceneInfo = await getSceneInfo(cliComponents, scene, rootCID, skipValidations);
         const protocol = isHttps ? 'https' : 'http';
         const queryParams = querystring_1.default.stringify(sceneInfo);

package/dist/commands/export-static/index.d.ts

@@ -1,24 +1,22 @@
 import { CliComponents } from '../../components';
 import { SceneProject } from '../../logic/project-validations';
+import { Result } from 'arg';
 interface Options {
-    args: typeof args;
+    args: Result<typeof args>;
     components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'config'>;
 }
-export declare const args: import("arg").Result<{
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-} & {
+export declare const args: {
     '--dir': StringConstructor;
     '--destination': StringConstructor;
     '--timestamp': StringConstructor;
     '--realmName': StringConstructor;
     '--baseUrl': StringConstructor;
-}>;
-export declare function help(): Promise<string>;
+};
+export declare function help(options: Options): Promise<void>;
 export declare function main(options: Options): Promise<{
     scenesUrn: string[];
     destination: string;
+    entities: string[];
 }>;
 export declare function prepareSceneFiles(options: Options, project: SceneProject, outputDirectory: string): Promise<{
     urn: string;

package/dist/commands/export-static/index.js

@@ -15,15 +15,15 @@ const beautiful_logs_1 = require("../../logic/beautiful-logs");
 const realm_1 = require("../../logic/realm");
 const scene_validations_1 = require("../../logic/scene-validations");
 const workspace_validations_1 = require("../../logic/workspace-validations");
-exports.args = (0, args_1.getArgs)({
+exports.args = (0, args_1.declareArgs)({
     '--dir': String,
     '--destination': String,
     '--timestamp': String,
     '--realmName': String,
     '--baseUrl': String
 });
-async function help() {
-    return `
+async function help(options) {
+    options.components.logger.log(`
   Usage:
     sdk-commands export-static --dir <directory> --destination <directory>
 
@@ -38,103 +38,109 @@ async function help() {
     --timestamp <timestamp>   A date to use in the deployable entity. Defaults to now()
     --realmName <name>        Creates a /<name>/about endpoint to expose the current deployment as a realm. Requires --baseUrl
     --baseUrl <baseUrl>       It is the public URL in which the --destination directory will be avaiable
-`;
+`);
 }
 exports.help = help;
 async function main(options) {
     const { fs, logger } = options.components;
     const workingDirectory = path_1.default.resolve(process.cwd(), options.args['--dir'] || '.');
     const outputDirectory = path_1.default.resolve(process.cwd(), options.args['--destination'] || '.');
-    const willCreateRealm = !!exports.args['--realmName'];
+    const willCreateRealm = !!options.args['--realmName'];
     let currentStep = 1;
     const maxSteps = 1 + (willCreateRealm ? 1 : 0);
-    if (willCreateRealm && !exports.args['--baseUrl']) {
+    /* istanbul ignore if */
+    if (willCreateRealm && !options.args['--baseUrl']) {
         throw new error_1.CliError(`--baseUrl is mandatory when --realmName is provided`);
     }
-    if (willCreateRealm && !/^[a-z][a-z0-9-/]*$/i.test(exports.args['--realmName'])) {
+    /* istanbul ignore if */
+    if (willCreateRealm && !/^[a-z][a-z0-9-/]*$/i.test(options.args['--realmName'])) {
         throw new error_1.CliError(`--realmName has invalid characters`);
     }
-    (0, beautiful_logs_1.printProgressStep)(logger, 'Reading project files...', currentStep++, maxSteps);
     await fs.mkdir(outputDirectory, { recursive: true });
+    /* istanbul ignore if */
     if (!(await fs.directoryExists(outputDirectory))) {
         throw new error_1.CliError(`The destination path ${outputDirectory} is not a directory`);
     }
     const scenesUrn = [];
+    const entities = [];
     const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
+    (0, beautiful_logs_1.printProgressStep)(logger, `Exporting ${workspace.projects.length} project(s)`, currentStep++, maxSteps);
     for (const project of workspace.projects) {
         (0, beautiful_logs_1.printCurrentProjectStarting)(options.components.logger, project, workspace);
         if (project.kind === 'scene') {
             const result = await prepareSceneFiles(options, project, outputDirectory);
             scenesUrn.push(result.urn);
+            entities.push(result.entityId);
         }
     }
     if (willCreateRealm) {
         // prepare the realm object
         (0, beautiful_logs_1.printProgressStep)(logger, 'Creating realm file...', currentStep++, maxSteps);
         const realm = await (0, realm_1.createStaticRealm)(options.components);
-        const realmName = exports.args['--realmName'];
+        const realmName = options.args['--realmName'];
         realm.configurations.scenesUrn = scenesUrn;
         realm.configurations.realmName = realmName;
         // write the realm file
         const realmDirectory = path_1.default.join(outputDirectory, realmName);
         await fs.mkdir(realmDirectory, { recursive: true });
+        /* istanbul ignore if */
         if (!(await fs.directoryExists(realmDirectory))) {
             throw new error_1.CliError(`The destination path ${realmDirectory} is not a directory`);
         }
         const dst = path_1.default.join(realmDirectory, 'about');
         await fs.writeFile(dst, JSON.stringify(realm, null, 2));
-        (0, beautiful_logs_1.printProgressInfo)(logger, `> ${realmName}/about -> [REALM FILE]`);
+        (0, beautiful_logs_1.printProgressInfo)(logger, `> ${realmName}/about ← [REALM FILE]`);
     }
     (0, beautiful_logs_1.printSuccess)(logger, `Export finished!`, `=> The entity URN are:${log_1.colors.bold(scenesUrn.map(($) => '\n - ' + $).join(''))}`);
-    return { scenesUrn, destination: outputDirectory };
+    return { scenesUrn, destination: outputDirectory, entities };
 }
 exports.main = main;
 async function prepareSceneFiles(options, project, outputDirectory) {
     const { fs, logger } = options.components;
-    const filesToExport = await (0, project_files_1.getProjectContentMappings)(options.components, project.workingDirectory, async (file) => {
+    const filesToExport = await (0, project_files_1.getProjectPublishableFilesWithHashes)(options.components, project.workingDirectory, async (file) => {
         return await (0, hashing_1.hashV1)(fs.createReadStream(path_1.default.resolve(project.workingDirectory, file)));
     });
-    (0, beautiful_logs_1.printProgressInfo)(logger, 'Copying files...');
-    for (const { file, hash } of filesToExport) {
-        const src = path_1.default.resolve(project.workingDirectory, file);
+    (0, beautiful_logs_1.printStep)(logger, 'Exporting static project');
+    for (const { absolutePath, hash } of filesToExport) {
         const dst = path_1.default.resolve(outputDirectory, hash);
-        if (src.startsWith(outputDirectory))
+        /* istanbul ignore if */
+        if (absolutePath.startsWith(outputDirectory)) {
+            (0, beautiful_logs_1.printWarning)(options.components.logger, `The file ${absolutePath} was omitted because it overwrites an input directory`);
             continue;
-        (0, beautiful_logs_1.printProgressInfo)(logger, `> ${hash} -> ${log_1.colors.reset(file)}`);
+        }
+        (0, beautiful_logs_1.printProgressInfo)(logger, `> ${hash} ← ${log_1.colors.reset(absolutePath)}`);
         if (!(await fs.fileExists(dst))) {
-            const content = await fs.readFile(src);
+            const content = await fs.readFile(absolutePath);
             await fs.writeFile(dst, content);
         }
     }
     // entity with ID are the deployed ones, when we generate the entity the ID is not
     // available because it is the result of hashing the following structure
     const entity = {
-        content: filesToExport,
+        content: (0, project_files_1.projectFilesToContentMappings)(project.workingDirectory, filesToExport),
         pointers: [],
-        timestamp: exports.args['--timestamp'] ? new Date(exports.args['--timestamp']).getTime() : Date.now(),
+        timestamp: options.args['--timestamp'] ? new Date(options.args['--timestamp']).getTime() : Date.now(),
         type: schemas_1.EntityType.SCENE,
         // for now, the only valid export is for scenes
         metadata: project.scene,
         version: 'v3'
     };
-    (0, beautiful_logs_1.printProgressInfo)(logger, 'Generating files...');
     // create the entity file and get the entityId
     const entityRaw = Buffer.from(JSON.stringify(entity), 'utf8');
     const entityId = await (0, hashing_1.hashV1)(entityRaw);
     const dst = path_1.default.resolve(outputDirectory, entityId);
     await fs.writeFile(dst, entityRaw);
-    (0, beautiful_logs_1.printProgressInfo)(logger, `> ${entityId} -> ${log_1.colors.reset('[ENTITY FILE]')}`);
+    (0, beautiful_logs_1.printStep)(logger, `> ${entityId} ← ${log_1.colors.reset('[ENTITY FILE]')}`);
     let urn = `urn:decentraland:entity:${entityId}`;
-    if (exports.args['--baseUrl']) {
-        urn += '?baseUrl=' + exports.args['--baseUrl'];
+    if (options.args['--baseUrl']) {
+        urn += '?baseUrl=' + options.args['--baseUrl'];
         // baseUrl must end with /
         if (!urn.endsWith('/'))
             urn += '/';
     }
     options.components.analytics.track('Export static', {
         projectHash: await (0, project_files_1.b64HashingFunction)(project.workingDirectory),
-        coords: (0, scene_validations_1.getBaseCoords)(project.scene),
-        args: (0, args_1.getArgsUsed)(options.args)
+        coords: (0, scene_validations_1.getBaseCoords)(project.scene)
     });
     return { urn, entityId, destination: outputDirectory };
 }

package/dist/commands/init/index.d.ts

@@ -1,18 +1,15 @@
 import { CliComponents } from '../../components';
+import { Result } from 'arg';
 interface Options {
-    args: typeof args;
+    args: Result<typeof args>;
     components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
-export declare const args: import("arg").Result<{
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-} & {
+export declare const args: {
     '--yes': BooleanConstructor;
     '-y': string;
     '--dir': StringConstructor;
     '--skip-install': BooleanConstructor;
-}>;
+};
 export declare function help(): Promise<void>;
 export declare function main(options: Options): Promise<void>;
 export {};

package/dist/commands/init/index.js

@@ -7,7 +7,7 @@ const error_1 = require("../../logic/error");
 const fs_1 = require("../../logic/fs");
 const repos_1 = require("./repos");
 const project_validations_1 = require("../../logic/project-validations");
-exports.args = (0, args_1.getArgs)({
+exports.args = (0, args_1.declareArgs)({
     '--yes': Boolean,
     '-y': '--yes',
     '--dir': String,
@@ -34,7 +34,7 @@ async function main(options) {
     if (shouldInstallDeps && !options.args['--skip-install']) {
         await (0, project_validations_1.installDependencies)(options.components, dir);
     }
-    options.components.analytics.track('Scene created', { projectType: scene, url, args: (0, args_1.getArgsUsed)(options.args) });
+    options.components.analytics.track('Scene created', { projectType: scene, url });
 }
 exports.main = main;
 const moveFilesFromDir = async (components, dir, folder) => {

package/dist/commands/start/index.d.ts

@@ -1,13 +1,10 @@
 import { CliComponents } from '../../components';
+import { Result } from 'arg';
 interface Options {
-    args: typeof args;
+    args: Result<typeof args>;
     components: Pick<CliComponents, 'fetch' | 'fs' | 'logger' | 'analytics' | 'spawner'>;
 }
-export declare const args: import("arg").Result<{
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-} & {
+export declare const args: {
     '--dir': StringConstructor;
     '--help': BooleanConstructor;
     '--port': NumberConstructor;
@@ -25,7 +22,7 @@ export declare const args: import("arg").Result<{
     '--skip-build': BooleanConstructor;
     '--desktop-client': BooleanConstructor;
     '--data-layer': BooleanConstructor;
-}>;
-export declare function help(): Promise<string>;
+};
+export declare function help(options: Options): Promise<void>;
 export declare function main(options: Options): Promise<void>;
 export {};

package/dist/commands/start/index.js

@@ -50,7 +50,7 @@ const rpc_1 = require("./data-layer/rpc");
 const exit_signal_1 = require("../../components/exit-signal");
 const workspace_validations_1 = require("../../logic/workspace-validations");
 const beautiful_logs_1 = require("../../logic/beautiful-logs");
-exports.args = (0, args_1.getArgs)({
+exports.args = (0, args_1.declareArgs)({
     '--dir': String,
     '--help': Boolean,
     '--port': Number,
@@ -69,8 +69,8 @@ exports.args = (0, args_1.getArgs)({
     '--desktop-client': Boolean,
     '--data-layer': Boolean
 });
-async function help() {
-    return `
+async function help(options) {
+    options.components.logger.log(`
   Usage: sdk-commands start [options]
 
     Options:
@@ -94,19 +94,19 @@ async function help() {
     - Start a local development server for a Decentraland Scene at a docker container
 
       $ sdk-commands start --ci
-`;
+`);
 }
 exports.help = help;
 async function main(options) {
     let baseCoords = { x: 0, y: 0 };
     const workingDirectory = path.resolve(process.cwd(), options.args['--dir'] || '.');
-    const isCi = exports.args['--ci'] || process.env.CI || false;
-    const debug = !exports.args['--no-debug'] && !isCi;
-    const openBrowser = !exports.args['--no-browser'] && !isCi;
-    const skipBuild = exports.args['--skip-build'];
-    const watch = !exports.args['--no-watch'];
-    const withDataLayer = exports.args['--data-layer'];
-    const enableWeb3 = exports.args['--web3'];
+    const isCi = options.args['--ci'] || process.env.CI || false;
+    const debug = !options.args['--no-debug'] && !isCi;
+    const openBrowser = !options.args['--no-browser'] && !isCi;
+    const skipBuild = options.args['--skip-build'];
+    const watch = !options.args['--no-watch'];
+    const withDataLayer = options.args['--data-layer'];
+    const enableWeb3 = options.args['--web3'];
     // TODO: FIX this hardcoded values ?
     const hasPortableExperience = false;
     const workspace = await (0, workspace_validations_1.getValidWorkspace)(options.components, workingDirectory);
@@ -128,12 +128,11 @@ async function main(options) {
         options.components.analytics.track('Preview started', {
             projectHash: await (0, project_files_1.b64HashingFunction)(project.workingDirectory),
             coords: baseCoords,
-            isWorkspace: false,
-            args: (0, args_1.getArgsUsed)(options.args)
+            isWorkspace: false
         });
     }
     (0, beautiful_logs_1.printProgressInfo)(options.components.logger, 'Starting preview server');
-    const port = await (0, get_free_port_1.getPort)(options.args['--port']);
+    const port = await (0, get_free_port_1.getPort)(options.args['--port'] || 0);
     const program = await interfaces_1.Lifecycle.run({
         async initComponents() {
             const metrics = (0, metrics_1.createTestMetricsComponent)(rooms_1.roomsMetrics);
@@ -200,7 +199,7 @@ async function main(options) {
             for (const addr of sortedURLs) {
                 components.logger.log(`    ${addr}`);
             }
-            if (exports.args['--desktop-client']) {
+            if (options.args['--desktop-client']) {
                 components.logger.log('\n  Desktop client:\n');
                 for (const addr of sortedURLs) {
                     const searchParams = new URLSearchParams();
@@ -211,7 +210,7 @@ async function main(options) {
             components.logger.log('\n  Details:\n');
             components.logger.log('\nPress CTRL+C to exit\n');
             // Open preferably localhost/127.0.0.1
-            if (openBrowser && sortedURLs.length && !exports.args['--desktop-client']) {
+            if (openBrowser && sortedURLs.length && !options.args['--desktop-client']) {
                 try {
                     await (0, open_1.default)(sortedURLs[0]);
                 }

package/dist/commands/start/server/endpoints.js

@@ -233,14 +233,15 @@ async function serveWearable(components, wearableJsonPath, baseUrl) {
         components.logger.error(`Unable to validate wearable.json properly, please check it.` + errors);
         throw new Error(`Invalid wearable.json (${wearableJsonPath})`);
     }
-    const hashedFiles = await (0, project_files_1.getProjectContentMappings)(components, wearableDir, project_files_1.b64HashingFunction);
-    const thumbnailFiltered = hashedFiles.filter(($) => $?.file === 'thumbnail.png');
-    const thumbnail = thumbnailFiltered.length > 0 && thumbnailFiltered[0]?.hash && `${baseUrl}/${thumbnailFiltered[0].hash}`;
+    const projectFiles = await (0, project_files_1.getProjectPublishableFilesWithHashes)(components, wearableDir, project_files_1.b64HashingFunction);
+    const contentFiles = (0, project_files_1.projectFilesToContentMappings)(wearableDir, projectFiles);
+    const thumbnailFiltered = contentFiles.filter(($) => $.file === 'thumbnail.png');
+    const thumbnail = thumbnailFiltered.length > 0 && thumbnailFiltered[0].hash && `${baseUrl}/${thumbnailFiltered[0].hash}`;
     const wearableId = 'urn:8dc2d7ad-97e3-44d0-ba89-e8305d795a6a';
     const representations = wearableJson.data.representations.map((representation) => ({
         ...representation,
         mainFile: `male/${representation.mainFile}`,
-        contents: hashedFiles.map(($) => ({
+        contents: contentFiles.map(($) => ({
             key: `male/${$?.file}`,
             url: `${baseUrl}/${$?.hash}`,
             hash: $?.hash
@@ -380,7 +381,8 @@ async function fakeEntityV3FromFolder(components, projectRoot, hashingFunction)
         const pointers = new Set();
         pointers.add(base);
         parcels.forEach(($) => pointers.add($));
-        const mappedFiles = await (0, project_files_1.getProjectContentMappings)(components, projectRoot, hashingFunction);
+        const projectFiles = await (0, project_files_1.getProjectPublishableFilesWithHashes)(components, projectRoot, hashingFunction);
+        const contentFiles = (0, project_files_1.projectFilesToContentMappings)(projectRoot, projectFiles);
         return {
             version: 'v3',
             type: schemas_1.EntityType.SCENE,
@@ -388,7 +390,7 @@ async function fakeEntityV3FromFolder(components, projectRoot, hashingFunction)
             pointers: Array.from(pointers),
             timestamp: Date.now(),
             metadata: sceneJson,
-            content: mappedFiles
+            content: contentFiles
         };
     }
     return null;

package/dist/components/analytics.d.ts

@@ -8,7 +8,6 @@ export type Events = {
     'Scene created': {
         projectType: string;
         url: string;
-        args: Record<string, unknown>;
     };
     'Preview started': {
         projectHash: string;
@@ -17,7 +16,6 @@ export type Events = {
             y: number;
         };
         isWorkspace: boolean;
-        args: Record<string, unknown>;
     };
     'Build scene': {
         projectHash: string;
@@ -26,7 +24,6 @@ export type Events = {
             y: number;
         };
         isWorkspace: boolean;
-        args: Record<string, unknown>;
     };
     'Export static': {
         projectHash: string;
@@ -34,7 +31,6 @@ export type Events = {
             x: number;
             y: number;
         };
-        args: Record<string, unknown>;
     };
     'Scene deploy started': {
         projectHash: string;
@@ -43,7 +39,6 @@ export type Events = {
             y: number;
         };
         isWorld: boolean;
-        args: Record<string, unknown>;
     };
     'Scene deploy success': {
         projectHash: string;
@@ -52,7 +47,6 @@ export type Events = {
             y: number;
         };
         isWorld: boolean;
-        args: Record<string, unknown>;
         dependencies: string[];
     };
     'Scene deploy failure': {
@@ -62,7 +56,6 @@ export type Events = {
             y: number;
         };
         isWorld: boolean;
-        args: Record<string, unknown>;
         error: string;
     };
 };

package/dist/index.d.ts

@@ -1,7 +1,2 @@
 #!/usr/bin/env node
-import { getArgs } from './logic/args';
-import { CliComponents } from './components';
-export interface Options {
-    args: ReturnType<typeof getArgs>;
-    components: CliComponents;
-}
+export {};

package/dist/index.js

@@ -2,54 +2,21 @@
 "use strict";
 /* istanbul ignore file */
 Object.defineProperty(exports, "__esModule", { value: true });
-const args_1 = require("./logic/args");
 const error_1 = require("./logic/error");
-const commands_1 = require("./logic/commands");
 const components_1 = require("./components");
-const beautiful_logs_1 = require("./logic/beautiful-logs");
 const log_1 = require("./components/log");
-const listCommandsStr = (commands) => commands.map(($) => `\t *sdk-commands ${$} \n`).join('');
-const commandFnsAreValid = (fns) => {
-    const { help, main } = fns;
-    if (!help || !main) {
-        throw new error_1.CliError(`Command does not follow implementation rules:
-      * Requires a "help" function
-      * Requires a "main" function
-    `);
-    }
-    return true;
-};
+const run_command_1 = require("./run-command");
 async function main() {
-    const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
-    const args = (0, args_1.getArgs)();
     const command = process.argv[2];
-    const needsHelp = args['--help'];
     const components = await (0, components_1.initComponents)();
-    const commands = await (0, commands_1.getCommands)(components);
-    if (!commands.includes(command)) {
-        if (needsHelp) {
-            components.logger.info(helpMessage(commands));
-            return;
-        }
-        throw new error_1.CliError(`Command ${command} is invalid. ${helpMessage(commands)}`);
+    try {
+        // pass on a list of arguments after the command itself
+        const argv = process.argv.slice(3);
+        await (0, run_command_1.runSdkCommand)(components, command, argv);
     }
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const cmd = require(`${commands_1.COMMANDS_PATH}/${command}`);
-    if (commandFnsAreValid(cmd)) {
-        const options = { args: cmd.args, components };
-        if (needsHelp) {
-            await cmd.help(options);
-        }
-        else {
-            (0, beautiful_logs_1.printCommand)(components.logger, command);
-            const ret = await cmd.main(options);
-            // print the result of the evaluation as json in the standard output
-            if (cmd.args['--json']) {
-                process.stdout.write(JSON.stringify(ret, null, 2));
-            }
-        }
+    finally {
+        await components.analytics.stop();
     }
-    await components.analytics.stop();
     // rollup watcher leaves many open FSWatcher even in build mode. we must call
     // process.exit at this point to prevent the program halting forever
     process.exit(process.exitCode || 0);

package/dist/logic/args.d.ts

@@ -2,11 +2,5 @@ import { Result } from 'arg';
 export type Args = {
     [key: string]: string | StringConstructor | NumberConstructor | BooleanConstructor;
 };
-export declare const DEFAULT_ARGS: {
-    '--help': BooleanConstructor;
-    '--json': BooleanConstructor;
-    '-h': string;
-};
-export declare function getArgs(): Result<typeof DEFAULT_ARGS>;
-export declare function getArgs<T extends Args>(args: T): Result<typeof DEFAULT_ARGS & T>;
-export declare function getArgsUsed(value: Result<typeof DEFAULT_ARGS>): Record<string, unknown>;
+export declare function parseArgs<T extends Args>(argv: string[], args: T): Result<T>;
+export declare function declareArgs<T extends Args>(args: T): T;

package/dist/logic/args.js

@@ -3,21 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArgsUsed = exports.getArgs = exports.DEFAULT_ARGS = void 0;
+exports.declareArgs = exports.parseArgs = void 0;
 const arg_1 = __importDefault(require("arg"));
-// updating to TS 4.9 will prevent losing types when
-// enforcing type to be "Args" by using "satisfies Args"
-exports.DEFAULT_ARGS = {
-    '--help': Boolean,
-    '--json': Boolean,
-    '-h': '--help'
-};
-function getArgs(args) {
-    return (0, arg_1.default)({ ...exports.DEFAULT_ARGS, ...args }, { permissive: true });
+const error_1 = require("./error");
+function parseArgs(argv, args) {
+    try {
+        return (0, arg_1.default)({ '--json': Boolean, '-h': '--help', '--help': Boolean, ...args }, { permissive: false, argv });
+    }
+    catch (err) {
+        if (err.name === 'ArgError')
+            throw new error_1.CliError(`Argument error: ` + err.message);
+        /* istanbul ignore next */
+        throw err;
+    }
 }
-exports.getArgs = getArgs;
-function getArgsUsed(value) {
-    const { _, ...args } = value;
+exports.parseArgs = parseArgs;
+function declareArgs(args) {
     return args;
 }
-exports.getArgsUsed = getArgsUsed;
+exports.declareArgs = declareArgs;

package/dist/logic/beautiful-logs.d.ts

@@ -3,6 +3,7 @@ import { ProjectUnion } from './project-validations';
 import { Workspace } from './workspace-validations';
 export declare function printProgressStep(logger: ILoggerComponent.ILogger, log: string, currentStep: number, maxStep: number): void;
 export declare function printProgressInfo(logger: ILoggerComponent.ILogger, log: string): void;
+export declare function printStep(logger: ILoggerComponent.ILogger, log: string): void;
 /**
  * If there are more than one project, we print the current project as "progress info"
  */

package/dist/logic/beautiful-logs.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSuccess = exports.printWarning = exports.printCommand = exports.printCurrentProjectStarting = exports.printProgressInfo = exports.printProgressStep = void 0;
+exports.printSuccess = exports.printWarning = exports.printCommand = exports.printCurrentProjectStarting = exports.printStep = exports.printProgressInfo = exports.printProgressStep = void 0;
 const path_1 = __importDefault(require("path"));
 const log_1 = require("../components/log");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -16,6 +16,10 @@ function printProgressInfo(logger, log) {
     logger.log(log_1.colors.dim(log));
 }
 exports.printProgressInfo = printProgressInfo;
+function printStep(logger, log) {
+    logger.log(log);
+}
+exports.printStep = printStep;
 /**
  * If there are more than one project, we print the current project as "progress info"
  */
@@ -23,7 +27,7 @@ function printCurrentProjectStarting(logger, project, workspace) {
     if (workspace.projects.length > 1) {
         const relativePath = path_1.default.relative(workspace.rootWorkingDirectory, project.workingDirectory);
         const progress = log_1.colors.dim(`[${workspace.projects.indexOf(project) + 1}/${workspace.projects.length}]`);
-        logger.log(log_1.colors.cyan(`in ${relativePath} ${progress}`));
+        logger.log(log_1.colors.cyan(`\n${progress} in ${relativePath}:`));
     }
 }
 exports.printCurrentProjectStarting = printCurrentProjectStarting;

package/dist/logic/bundle.js

@@ -6,7 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundleProject = void 0;
-/* istanbul ignore file */
 const esbuild_1 = __importDefault(require("esbuild"));
 const child_process_1 = __importDefault(require("child_process"));
 const fp_future_1 = require("fp-future");
@@ -19,16 +18,20 @@ const glob_1 = require("glob");
 const MAX_STEP = 2;
 async function bundleProject(components, options, sceneJson) {
     const tsconfig = (0, path_1.join)(options.workingDirectory, 'tsconfig.json');
+    /* istanbul ignore if */
     if (!options.single && !sceneJson.main) {
         throw new error_1.CliError('scene.json .main must be present');
     }
+    /* istanbul ignore if */
     if (sceneJson.runtimeVersion !== '7') {
         throw new error_1.CliError('scene.json `"runtimeVersion": "7"` must be present');
     }
+    /* istanbul ignore if */
     if (!(await components.fs.fileExists(tsconfig))) {
         throw new error_1.CliError(`File ${tsconfig} must exist to compile the Typescript project`);
     }
     const input = (0, glob_1.globSync)(options.single ?? 'src/index.ts', { cwd: options.workingDirectory, absolute: true });
+    /* istanbul ignore if */
     if (!input.length)
         throw new error_1.CliError(`There are no input files to build: ${options.single ?? 'src/index.ts'}`);
     const output = !options.single ? sceneJson.main : options.single.replace(/\.ts$/, '.js');
@@ -70,6 +73,7 @@ async function bundleProject(components, options, sceneJson) {
             hashbang: false
         }
     });
+    /* istanbul ignore if */
     if (options.watch) {
         await context.watch({});
         (0, beautiful_logs_1.printProgressInfo)(components.logger, `Bundle saved ${log_1.colors.bold(output)}`);
@@ -82,6 +86,7 @@ async function bundleProject(components, options, sceneJson) {
                 .join(',') || outfile)}`);
         }
         catch (err) {
+            /* istanbul ignore next */
             throw new error_1.CliError(err.toString());
         }
         await context.dispose();
@@ -100,12 +105,14 @@ function runTypeChecker(components, options) {
         '--preserveWatchOutput',
         options.emitDeclaration ? '--emitDeclarationOnly' : '--noEmit'
     ];
+    /* istanbul ignore if */
     if (options.watch)
         args.push('--watch');
     (0, beautiful_logs_1.printProgressStep)(components.logger, `Running type checker`, 2, MAX_STEP);
     const ts = child_process_1.default.spawn('node', args, { env: process.env, cwd: options.workingDirectory });
     const typeCheckerFuture = (0, fp_future_1.future)();
     ts.on('close', (code) => {
+        /* istanbul ignore else */
         if (code === 0) {
             (0, beautiful_logs_1.printProgressInfo)(components.logger, `Type checking completed without errors`);
         }
@@ -117,6 +124,7 @@ function runTypeChecker(components, options) {
     });
     ts.stdout.pipe(process.stdout);
     ts.stderr.pipe(process.stderr);
+    /* istanbul ignore if */
     if (options.watch) {
         typeCheckerFuture.resolve(-1);
     }

package/dist/logic/commands.js

@@ -8,12 +8,14 @@ async function getCommands({ fs }) {
     const commandDirs = await fs.readdir(exports.COMMANDS_PATH);
     const commands = commandDirs.map(async (dir) => {
         const path = (0, path_1.resolve)(exports.COMMANDS_PATH, dir);
-        const statDir = await fs.stat(path);
-        if (!statDir.isDirectory()) {
+        if (!(await fs.directoryExists(path))) {
             throw new error_1.CliError('Developer: All commands must be inside a folder');
         }
-        const statIndex = await fs.stat(`${path}/index.js`);
-        if (!statIndex.isFile()) {
+        try {
+            require.resolve(`${path}`);
+        }
+        catch {
+            /* istanbul ignore next */
             throw new error_1.CliError('Developer: All commands must have an "index.js" file inside');
         }
         return dir;

package/dist/logic/dcl-ignore.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDCLIgnorePatterns = exports.getDCLIgnoreFileContents = exports.defaultDclIgnore = void 0;
-/* istanbul ignore file */
 const path_1 = __importDefault(require("path"));
 exports.defaultDclIgnore = [
     '.*',

package/dist/logic/get-free-port.d.ts

@@ -1 +1 @@
-export declare function getPort(port?: number, failoverPort?: number): Promise<number>;
+export declare function getPort(port: number, failoverPort?: number): Promise<number>;

package/dist/logic/get-free-port.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPort = void 0;
 const portfinder_1 = __importDefault(require("portfinder"));
-async function getPort(port = 0, failoverPort = 2044) {
-    let resolvedPort = port && Number.isInteger(port) ? port : 0;
+async function getPort(port, failoverPort = 2044) {
+    let resolvedPort = port && Number.isInteger(port) ? +port : 0;
     if (!resolvedPort) {
         try {
             resolvedPort = await portfinder_1.default.getPortPromise({ port: resolvedPort });

package/dist/logic/project-files.d.ts

@@ -1,5 +1,9 @@
 import { ContentMapping } from '@dcl/schemas/dist/misc/content-mapping';
 import { CliComponents } from '../components';
+export type ProjectFile = {
+    absolutePath: string;
+    hash: string;
+};
 /**
  * Returns an array of the publishable files for a given folder.
  *
@@ -9,13 +13,21 @@ export declare function getPublishableFiles(components: Pick<CliComponents, 'fs'
  * This function converts paths to decentraland-compatible paths.
  * - From windows separators to unix separators.
  * - All to lowercase
- *
  */
-export declare function normalizeDecentralandFilename(filename: string): string;
+export declare function normalizeDecentralandFilename(projectRoot: string, filename: string): string;
+/**
+ * This function normalizes the content mappings of a project to be used by the
+ * Decentraland file system
+ */
+export declare function projectFilesToContentMappings(projectRoot: string, files: ProjectFile[]): ContentMapping[];
 /**
  * Returns the content mappings for a specific project folder.
+ * NOTE: the result of this function IS NOT NORMALIZED. Paths sould be normalized
+ * with normalizeDecentralandFilename before usage
+ *
+ * TODO: Unit test this function
  */
-export declare function getProjectContentMappings(components: Pick<CliComponents, 'fs'>, projectRoot: string, hashingFunction: (filePath: string) => Promise<string>): Promise<ContentMapping[]>;
+export declare function getProjectPublishableFilesWithHashes(components: Pick<CliComponents, 'fs'>, projectRoot: string, hashingFunction: (filePath: string) => Promise<string>): Promise<ProjectFile[]>;
 export declare const b64HashingFunction: (str: string) => Promise<string>;
 interface PackageJson {
     dependencies: Record<string, string>;

package/dist/logic/project-files.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJson = exports.b64HashingFunction = exports.getProjectContentMappings = exports.normalizeDecentralandFilename = exports.getPublishableFiles = void 0;
+exports.getPackageJson = exports.b64HashingFunction = exports.getProjectPublishableFilesWithHashes = exports.projectFilesToContentMappings = exports.normalizeDecentralandFilename = exports.getPublishableFiles = void 0;
 const dcl_ignore_1 = require("./dcl-ignore");
 const glob_1 = require("glob");
 const ignore_1 = __importDefault(require("ignore"));
@@ -36,7 +36,6 @@ const error_1 = require("./error");
  * Returns an array of the publishable files for a given folder.
  *
  */
-/* istanbul ignore next */
 async function getPublishableFiles(components, projectRoot) {
     const ignorePatterns = await (0, dcl_ignore_1.getDCLIgnorePatterns)(components, projectRoot);
     const ig = (0, ignore_1.default)().add(ignorePatterns);
@@ -54,20 +53,36 @@ exports.getPublishableFiles = getPublishableFiles;
  * This function converts paths to decentraland-compatible paths.
  * - From windows separators to unix separators.
  * - All to lowercase
- *
  */
-/* istanbul ignore next */
-function normalizeDecentralandFilename(filename) {
-    return filename.replace(/(\\)/g, '/').toLowerCase();
+function normalizeDecentralandFilename(projectRoot, filename) {
+    const newAbsolute = path_1.default.resolve(projectRoot, filename);
+    const relativePath = path_1.default.relative(projectRoot, newAbsolute);
+    // 1. win->unix style
+    // 2. remove heading /
+    return relativePath.replace(/(\\)/g, '/').replace(/^\/+/, '').toLowerCase();
 }
 exports.normalizeDecentralandFilename = normalizeDecentralandFilename;
+/**
+ * This function normalizes the content mappings of a project to be used by the
+ * Decentraland file system
+ */
+function projectFilesToContentMappings(projectRoot, files) {
+    return files.map((file) => {
+        return {
+            file: normalizeDecentralandFilename(projectRoot, file.absolutePath),
+            hash: file.hash
+        };
+    });
+}
+exports.projectFilesToContentMappings = projectFilesToContentMappings;
 /**
  * Returns the content mappings for a specific project folder.
+ * NOTE: the result of this function IS NOT NORMALIZED. Paths sould be normalized
+ * with normalizeDecentralandFilename before usage
+ *
+ * TODO: Unit test this function
  */
-/* istanbul ignore next */
-async function getProjectContentMappings(components, projectRoot, 
-/* istanbul ignore next */
-hashingFunction) {
+async function getProjectPublishableFilesWithHashes(components, projectRoot, hashingFunction) {
     const projectFiles = await getPublishableFiles(components, projectRoot);
     const ret = [];
     const usedFilenames = new Set();
@@ -76,21 +91,20 @@ hashingFunction) {
         /* istanbul ignore if */
         if (!(await components.fs.fileExists(absolutePath)))
             continue;
-        // remove heading '/'
-        const normalizedFile = normalizeDecentralandFilename(file).replace(/^\/+/, '');
+        const normalizedFile = normalizeDecentralandFilename(projectRoot, file);
         /* istanbul ignore if */
         if (usedFilenames.has(normalizedFile)) {
             throw new error_1.CliError(`DuplicatedFilenameError: the file ${file} exists with a different casing. Please manually remove one occurrence`);
         }
         usedFilenames.add(normalizedFile);
         ret.push({
-            file: normalizedFile,
+            absolutePath,
             hash: await hashingFunction(absolutePath)
         });
     }
     return ret;
 }
-exports.getProjectContentMappings = getProjectContentMappings;
+exports.getProjectPublishableFilesWithHashes = getProjectPublishableFilesWithHashes;
 const b64HashingFunction = async (str) => 'b64-' + Buffer.from(str).toString('base64');
 exports.b64HashingFunction = b64HashingFunction;
 /* istanbul ignore next */

package/dist/logic/workspace-validations.js

@@ -67,7 +67,6 @@ exports.getWorkspaceFilePath = getWorkspaceFilePath;
 function assertValidWorkspace(workspace) {
     if (!WorkspaceJson.validate(workspace)) {
         const errors = [];
-        /* istanbul ignore if */
         if (WorkspaceJson.validate.errors) {
             for (const error of WorkspaceJson.validate.errors) {
                 errors.push(`Error validating ${WORKSPACE_FILE}: ${error.message}`);

package/dist/run-command.d.ts

@@ -0,0 +1,7 @@
+import { CliComponents } from './components';
+import { parseArgs } from './logic/args';
+export interface Options {
+    args: ReturnType<typeof parseArgs>;
+    components: CliComponents;
+}
+export declare function runSdkCommand(components: CliComponents, command: string, argv: string[]): Promise<any>;

package/dist/run-command.js

@@ -0,0 +1,73 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSdkCommand = void 0;
+const args_1 = require("./logic/args");
+const beautiful_logs_1 = require("./logic/beautiful-logs");
+const commands_1 = require("./logic/commands");
+const error_1 = require("./logic/error");
+const listCommandsStr = (commands) => commands.map(($) => `\t *sdk-commands ${$} \n`).join('');
+/* istanbul ignore next */
+function asserValidCommand(fns) {
+    const { help, main } = fns;
+    if (!help || !main) {
+        throw new error_1.CliError(`Command does not follow implementation rules:
+      * Requires a "help" function
+      * Requires a "main" function
+    `);
+    }
+    return true;
+}
+async function runSdkCommand(components, command, argv) {
+    const helpMessage = (commands) => `Here is the list of commands:\n${listCommandsStr(commands)}`;
+    const needsHelp = argv.includes('--help') || argv.includes('-h');
+    const needsJson = argv.includes('--json');
+    const commands = await (0, commands_1.getCommands)(components);
+    if (!commands.includes(command)) {
+        if (needsHelp) {
+            components.logger.log(helpMessage(commands));
+            return;
+        }
+        /* istanbul ignore next */
+        throw new error_1.CliError(`Command ${command} is invalid. ${helpMessage(commands)}`);
+    }
+    const cmd = await Promise.resolve(`${`./commands/${command}`}`).then(s => __importStar(require(s)));
+    if (asserValidCommand(cmd)) {
+        const options = { args: (0, args_1.parseArgs)(argv, cmd.args), components };
+        if (needsHelp) {
+            await cmd.help(options);
+        }
+        else {
+            (0, beautiful_logs_1.printCommand)(components.logger, command);
+            const ret = await cmd.main(options);
+            // print the result of the evaluation as json in the standard output
+            if (needsJson) {
+                process.stdout.write(JSON.stringify(ret, null, 2));
+            }
+            return ret;
+        }
+    }
+}
+exports.runSdkCommand = runSdkCommand;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dcl/sdk-commands",
   "description": "",
-  "version": "7.1.4-4619276636.commit-e2c17cb",
+  "version": "7.1.4-4622328580.commit-fe88e6c",
   "author": "Decentraland",
   "bin": {
     "sdk-commands": "./dist/index.js"
   },
   "dependencies": {
     "@dcl/hashing": "1.1.3",
-    "@dcl/inspector": "7.1.4-4619276636.commit-e2c17cb",
+    "@dcl/inspector": "7.1.4-4622328580.commit-fe88e6c",
     "@dcl/linker-dapp": "0.7.0",
     "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
     "@dcl/protocol": "1.0.0-4597420155.commit-e877adc",
@@ -60,5 +60,5 @@
     "displayName": "SDK",
     "tsconfig": "./tsconfig.json"
   },
-  "commit": "e2c17cba10c6b7e6f69dd012ea03ecc6d245fd01"
+  "commit": "fe88e6c95b93e2eddcf1c3ace0dd3abeba5219e7"
 }