syncodemayo 1.0.9 → 2.0.0

package/dist/lib/TargetServer.js

@@ -0,0 +1,76 @@
+import * as Log from './Log.js';
+import { resolveTarget } from './Config.js';
+import { Connection } from './Connection.js';
+import { Sync } from './Sync.js';
+export class TargetServer {
+    get config() {
+        return this._targetConfig;
+    }
+    get name() {
+        return this.config._name;
+    }
+    /**
+     * `connect` opens the connection for each operation. It defaults to FTP/FTPS (`Connection`);
+     * tests pass a fake.
+     */
+    constructor(config, target, connect = Connection.create) {
+        this._config = config;
+        this._targetConfig = resolveTarget(config, target);
+        this._connect = connect;
+    }
+    // Opens a connection, runs `task` with it, and closes it, whether `task` resolves or rejects.
+    async _withConnection(task) {
+        const conn = this._connect(this._targetConfig);
+        try {
+            return await task(conn);
+        }
+        finally {
+            try {
+                await conn.close();
+            }
+            catch (err) {
+                Log.debug("Error closing the connection:", err);
+            }
+        }
+    }
+    /**
+     * Add a cache file, if there's not one. `target.path` must already exist: a missing path is
+     * most likely a typo, so this rejects (telling the user to create the folder) and creates
+     * nothing.
+     */
+    async prepare(force) {
+        const remoteCachePath = `${this._targetConfig.path}/${this._targetConfig.cache}`;
+        return this._withConnection(async (conn) => {
+            const remoteIsConfigured = await conn.remoteFileExists(remoteCachePath);
+            if (remoteIsConfigured && force !== true) {
+                Log.info(`${this._targetConfig.host} already is initialized.`);
+                return false;
+            }
+            const { path, host } = this._targetConfig;
+            const remoteDirFound = await conn.remoteDirectoryFound(path);
+            if (!remoteDirFound) {
+                throw new Error(`Remote path "${path}" not found on ${host}. ` +
+                    `Check the target's "path", or create the folder on the server, then run init again.`);
+            }
+            await conn.putContent("{}", remoteCachePath);
+            return true;
+        });
+    }
+    /**
+     * Verify the server has a cache file
+     */
+    async verify() {
+        const remoteCachePath = `${this._targetConfig.path}/${this._targetConfig.cache}`;
+        return this._withConnection(conn => conn.remoteFileExists(remoteCachePath));
+    }
+    /**
+     * Sync local files to target server
+     */
+    async sync(isDryRun, forceConfirmation = false) {
+        return this._withConnection(conn => Sync.create(conn, this._config, this._targetConfig).run(isDryRun, forceConfirmation));
+    }
+    static create(config, targetConfig, connect) {
+        return new TargetServer(config, targetConfig, connect);
+    }
+}
+//# sourceMappingURL=TargetServer.js.map

package/dist/lib/TargetServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TargetServer.js","sourceRoot":"./","sources":["lib/TargetServer.ts"],"names":[],"mappings":"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","sourcesContent":["import * as Log from './Log.js'\nimport { IConfig, ITargetConfig, resolveTarget } from './Config.js'\nimport { Connection } from './Connection.js'\nimport { ConnectionFactory, RemoteConnection } from './RemoteConnection.js'\nimport { Sync, IChangeset } from './Sync.js'\n\nexport class TargetServer {\n  private _config: IConfig\n  private _targetConfig: ITargetConfig\n  private _connect: ConnectionFactory\n\n  get config() {\n    return this._targetConfig\n  }\n\n  get name() {\n    return this.config._name\n  }\n\n  /**\n   * `connect` opens the connection for each operation. It defaults to FTP/FTPS (`Connection`);\n   * tests pass a fake.\n   */\n  constructor(config: IConfig, target: string | ITargetConfig | undefined, connect: ConnectionFactory = Connection.create) {\n    this._config = config\n    this._targetConfig = resolveTarget(config, target)\n    this._connect = connect\n  }\n\n  // Opens a connection, runs `task` with it, and closes it, whether `task` resolves or rejects.\n  private async _withConnection<T>(task: (conn: RemoteConnection) => Promise<T>): Promise<T> {\n    const conn = this._connect(this._targetConfig)\n    try {\n      return await task(conn)\n    }\n    finally {\n      try {\n        await conn.close()\n      }\n      catch (err) {\n        Log.debug(\"Error closing the connection:\", err)\n      }\n    }\n  }\n\n  /**\n   * Add a cache file, if there's not one. `target.path` must already exist: a missing path is\n   * most likely a typo, so this rejects (telling the user to create the folder) and creates\n   * nothing.\n   */\n  async prepare(force?: boolean): Promise<boolean> {\n    const remoteCachePath = `${this._targetConfig.path}/${this._targetConfig.cache}`\n    return this._withConnection(async (conn) => {\n      const remoteIsConfigured = await conn.remoteFileExists(remoteCachePath)\n\n      if (remoteIsConfigured && force !== true) {\n        Log.info(`${this._targetConfig.host} already is initialized.`)\n        return false\n      }\n\n      const { path, host } = this._targetConfig\n      const remoteDirFound = await conn.remoteDirectoryFound(path)\n      if (!remoteDirFound) {\n        throw new Error(\n          `Remote path \"${path}\" not found on ${host}. ` +\n          `Check the target's \"path\", or create the folder on the server, then run init again.`)\n      }\n\n      await conn.putContent(\"{}\", remoteCachePath)\n\n      return true\n    })\n  }\n\n  /**\n   * Verify the server has a cache file\n   */\n  async verify(): Promise<boolean> {\n    const remoteCachePath = `${this._targetConfig.path}/${this._targetConfig.cache}`\n    return this._withConnection(conn => conn.remoteFileExists(remoteCachePath))\n  }\n\n  /**\n   * Sync local files to target server\n   */\n  async sync(isDryRun: boolean, forceConfirmation = false): Promise<IChangeset | null> {\n    return this._withConnection(conn =>\n      Sync.create(conn, this._config, this._targetConfig).run(isDryRun, forceConfirmation))\n  }\n\n  static create(config: IConfig, targetConfig: string | ITargetConfig | undefined, connect?: ConnectionFactory): TargetServer {\n    return new TargetServer(config, targetConfig, connect)\n  }\n}\n"]}

package/dist/lib/index.d.ts

@@ -0,0 +1,8 @@
+export * from './Client.js';
+export * from './Config.js';
+export * from './ConfigSchema.js';
+export * from './Connection.js';
+export * from './Filelist.js';
+export * from './RemoteConnection.js';
+export * from './Sync.js';
+export * from './TargetServer.js';

package/dist/lib/index.js

@@ -0,0 +1,9 @@
+export * from './Client.js';
+export * from './Config.js';
+export * from './ConfigSchema.js';
+export * from './Connection.js';
+export * from './Filelist.js';
+export * from './RemoteConnection.js';
+export * from './Sync.js';
+export * from './TargetServer.js';
+//# sourceMappingURL=index.js.map

package/dist/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"./","sources":["lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA","sourcesContent":["export * from './Client.js'\nexport * from './Config.js'\nexport * from './ConfigSchema.js'\nexport * from './Connection.js'\nexport * from './Filelist.js'\nexport * from './RemoteConnection.js'\nexport * from './Sync.js'\nexport * from './TargetServer.js'"]}

package/dist/vendor/strip-json-comments.d.ts

@@ -0,0 +1,23 @@
+export type Options = {
+    /**
+    Strip trailing commas in addition to comments.
+
+    @default false
+    */
+    readonly trailingCommas?: boolean;
+    /**
+    Replace comments and trailing commas with whitespace instead of stripping them entirely.
+
+    @default true
+    */
+    readonly whitespace?: boolean;
+};
+/**
+Strip comments from JSON. Lets you use comments in your JSON files!
+
+It will replace single-line comments `//` and multi-line comments `/**\/` with whitespace. This allows JSON error positions to remain as close as possible to the original source.
+
+@param jsonString - Accepts a string with JSON.
+@returns A JSON string without comments.
+*/
+export default function stripJsonComments(jsonString: string, { whitespace, trailingCommas }?: Options): string;

package/dist/vendor/strip-json-comments.js

@@ -0,0 +1,126 @@
+/*
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+const singleComment = Symbol('singleComment');
+const multiComment = Symbol('multiComment');
+const stripWithoutWhitespace = (_string, _start, _end) => '';
+// Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.
+const stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/[^ \t\r\n]/g, ' ');
+const isEscaped = (jsonString, quotePosition) => {
+    let index = quotePosition - 1;
+    let backslashCount = 0;
+    while (jsonString[index] === '\\') {
+        index -= 1;
+        backslashCount += 1;
+    }
+    return Boolean(backslashCount % 2);
+};
+/**
+Strip comments from JSON. Lets you use comments in your JSON files!
+
+It will replace single-line comments `//` and multi-line comments `/**\/` with whitespace. This allows JSON error positions to remain as close as possible to the original source.
+
+@param jsonString - Accepts a string with JSON.
+@returns A JSON string without comments.
+*/
+export default function stripJsonComments(jsonString, { whitespace = true, trailingCommas = false } = {}) {
+    if (typeof jsonString !== 'string') {
+        throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
+    }
+    const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
+    let isInsideString = false;
+    let isInsideComment = false;
+    let offset = 0;
+    let buffer = '';
+    let result = '';
+    let commaIndex = -1;
+    for (let index = 0; index < jsonString.length; index++) {
+        const currentCharacter = jsonString[index];
+        const nextCharacter = jsonString[index + 1];
+        if (!isInsideComment && currentCharacter === '"') {
+            // Enter or exit string
+            const escaped = isEscaped(jsonString, index);
+            if (!escaped) {
+                isInsideString = !isInsideString;
+            }
+        }
+        if (isInsideString) {
+            continue;
+        }
+        if (!isInsideComment && currentCharacter + nextCharacter === '//') {
+            // Enter single-line comment
+            buffer += jsonString.slice(offset, index);
+            offset = index;
+            isInsideComment = singleComment;
+            index++;
+        }
+        else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
+            // Exit single-line comment via \r\n
+            index++;
+            isInsideComment = false;
+            buffer += strip(jsonString, offset, index);
+            offset = index;
+            continue;
+        }
+        else if (isInsideComment === singleComment && currentCharacter === '\n') {
+            // Exit single-line comment via \n
+            isInsideComment = false;
+            buffer += strip(jsonString, offset, index);
+            offset = index;
+        }
+        else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
+            // Enter multiline comment
+            buffer += jsonString.slice(offset, index);
+            offset = index;
+            isInsideComment = multiComment;
+            index++;
+            continue;
+        }
+        else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
+            // Exit multiline comment
+            index++;
+            isInsideComment = false;
+            buffer += strip(jsonString, offset, index + 1);
+            offset = index + 1;
+            continue;
+        }
+        else if (trailingCommas && !isInsideComment) {
+            if (commaIndex !== -1) {
+                if (currentCharacter === '}' || currentCharacter === ']') {
+                    // Strip trailing comma
+                    buffer += jsonString.slice(offset, index);
+                    result += strip(buffer, 0, 1) + buffer.slice(1);
+                    buffer = '';
+                    offset = index;
+                    commaIndex = -1;
+                }
+                else if (currentCharacter !== ' ' && currentCharacter !== '\t' && currentCharacter !== '\r' && currentCharacter !== '\n') {
+                    // Hit non-whitespace following a comma; comma is not trailing
+                    buffer += jsonString.slice(offset, index);
+                    offset = index;
+                    commaIndex = -1;
+                }
+            }
+            else if (currentCharacter === ',') {
+                // Flush buffer prior to this point, and save new comma index
+                result += buffer + jsonString.slice(offset, index);
+                buffer = '';
+                offset = index;
+                commaIndex = index;
+            }
+        }
+    }
+    const remaining = (isInsideComment === singleComment)
+        ? strip(jsonString, offset)
+        : jsonString.slice(offset);
+    return result + buffer + remaining;
+}
+//# sourceMappingURL=strip-json-comments.js.map

package/dist/vendor/strip-json-comments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"strip-json-comments.js","sourceRoot":"./","sources":["vendor/strip-json-comments.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAsBF,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAC9C,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAI5C,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,IAAa,EAAU,EAAE,CAAC,EAAE,CAAC;AAE/F,qHAAqH;AACrH,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,KAAc,EAAE,GAAY,EAAU,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;AAE3I,MAAM,SAAS,GAAG,CAAC,UAAkB,EAAE,aAAqB,EAAW,EAAE;IACxE,IAAI,KAAK,GAAG,aAAa,GAAG,CAAC,CAAC;IAC9B,IAAI,cAAc,GAAG,CAAC,CAAC;IAEvB,OAAO,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QACnC,KAAK,IAAI,CAAC,CAAC;QACX,cAAc,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,OAAO,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF;;;;;;;EAOE;AACF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,UAAkB,EAAE,EAAC,UAAU,GAAG,IAAI,EAAE,cAAc,GAAG,KAAK,KAAa,EAAE;IACtH,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,IAAI,SAAS,CAAC,8DAA8D,OAAO,UAAU,IAAI,CAAC,CAAC;IAC1G,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,sBAAsB,CAAC;IAExE,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,eAAe,GAAiB,KAAK,CAAC;IAC1C,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC;IAEpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACxD,MAAM,gBAAgB,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAE5C,IAAI,CAAC,eAAe,IAAI,gBAAgB,KAAK,GAAG,EAAE,CAAC;YAClD,uBAAuB;YACvB,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,cAAc,GAAG,CAAC,cAAc,CAAC;YAClC,CAAC;QACF,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACpB,SAAS;QACV,CAAC;QAED,IAAI,CAAC,eAAe,IAAI,gBAAgB,GAAG,aAAa,KAAK,IAAI,EAAE,CAAC;YACnE,4BAA4B;YAC5B,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM,GAAG,KAAK,CAAC;YACf,eAAe,GAAG,aAAa,CAAC;YAChC,KAAK,EAAE,CAAC;QACT,CAAC;aAAM,IAAI,eAAe,KAAK,aAAa,IAAI,gBAAgB,GAAG,aAAa,KAAK,MAAM,EAAE,CAAC;YAC7F,oCAAoC;YACpC,KAAK,EAAE,CAAC;YACR,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,GAAG,KAAK,CAAC;YACf,SAAS;QACV,CAAC;aAAM,IAAI,eAAe,KAAK,aAAa,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC3E,kCAAkC;YAClC,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,GAAG,KAAK,CAAC;QAChB,CAAC;aAAM,IAAI,CAAC,eAAe,IAAI,gBAAgB,GAAG,aAAa,KAAK,IAAI,EAAE,CAAC;YAC1E,0BAA0B;YAC1B,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM,GAAG,KAAK,CAAC;YACf,eAAe,GAAG,YAAY,CAAC;YAC/B,KAAK,EAAE,CAAC;YACR,SAAS;QACV,CAAC;aAAM,IAAI,eAAe,KAAK,YAAY,IAAI,gBAAgB,GAAG,aAAa,KAAK,IAAI,EAAE,CAAC;YAC1F,yBAAyB;YACzB,KAAK,EAAE,CAAC;YACR,eAAe,GAAG,KAAK,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC/C,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC;YACnB,SAAS;QACV,CAAC;aAAM,IAAI,cAAc,IAAI,CAAC,eAAe,EAAE,CAAC;YAC/C,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;gBACvB,IAAI,gBAAgB,KAAK,GAAG,IAAI,gBAAgB,KAAK,GAAG,EAAE,CAAC;oBAC1D,uBAAuB;oBACvB,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAC1C,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAChD,MAAM,GAAG,EAAE,CAAC;oBACZ,MAAM,GAAG,KAAK,CAAC;oBACf,UAAU,GAAG,CAAC,CAAC,CAAC;gBACjB,CAAC;qBAAM,IAAI,gBAAgB,KAAK,GAAG,IAAI,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;oBAC5H,8DAA8D;oBAC9D,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAC1C,MAAM,GAAG,KAAK,CAAC;oBACf,UAAU,GAAG,CAAC,CAAC,CAAC;gBACjB,CAAC;YACF,CAAC;iBAAM,IAAI,gBAAgB,KAAK,GAAG,EAAE,CAAC;gBACrC,6DAA6D;gBAC7D,MAAM,IAAI,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACnD,MAAM,GAAG,EAAE,CAAC;gBACZ,MAAM,GAAG,KAAK,CAAC;gBACf,UAAU,GAAG,KAAK,CAAC;YACpB,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,eAAe,KAAK,aAAa,CAAC;QACpD,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC;QAC3B,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5B,OAAO,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AACpC,CAAC","sourcesContent":["/*\nMIT License\n\nCopyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n*/\n\n// Vendored from strip-json-comments 5.0.3 (https://github.com/sindresorhus/strip-json-comments),\n// index.js and index.d.ts, converted to TypeScript. The logic is unchanged; only type annotations\n// were added. Upstream is ESM-only, so it is vendored here instead of depended on.\n\nexport type Options = {\n\t/**\n\tStrip trailing commas in addition to comments.\n\n\t@default false\n\t*/\n\treadonly trailingCommas?: boolean;\n\n\t/**\n\tReplace comments and trailing commas with whitespace instead of stripping them entirely.\n\n\t@default true\n\t*/\n\treadonly whitespace?: boolean;\n};\n\nconst singleComment = Symbol('singleComment');\nconst multiComment = Symbol('multiComment');\n\ntype CommentState = false | typeof singleComment | typeof multiComment;\n\nconst stripWithoutWhitespace = (_string: string, _start?: number, _end?: number): string => '';\n\n// Replace all characters except ASCII spaces, tabs and line endings with regular spaces to ensure valid JSON output.\nconst stripWithWhitespace = (string: string, start?: number, end?: number): string => string.slice(start, end).replace(/[^ \\t\\r\\n]/g, ' ');\n\nconst isEscaped = (jsonString: string, quotePosition: number): boolean => {\n\tlet index = quotePosition - 1;\n\tlet backslashCount = 0;\n\n\twhile (jsonString[index] === '\\\\') {\n\t\tindex -= 1;\n\t\tbackslashCount += 1;\n\t}\n\n\treturn Boolean(backslashCount % 2);\n};\n\n/**\nStrip comments from JSON. Lets you use comments in your JSON files!\n\nIt will replace single-line comments `//` and multi-line comments `/**\\/` with whitespace. This allows JSON error positions to remain as close as possible to the original source.\n\n@param jsonString - Accepts a string with JSON.\n@returns A JSON string without comments.\n*/\nexport default function stripJsonComments(jsonString: string, {whitespace = true, trailingCommas = false}: Options = {}): string {\n\tif (typeof jsonString !== 'string') {\n\t\tthrow new TypeError(`Expected argument \\`jsonString\\` to be a \\`string\\`, got \\`${typeof jsonString}\\``);\n\t}\n\n\tconst strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;\n\n\tlet isInsideString = false;\n\tlet isInsideComment: CommentState = false;\n\tlet offset = 0;\n\tlet buffer = '';\n\tlet result = '';\n\tlet commaIndex = -1;\n\n\tfor (let index = 0; index < jsonString.length; index++) {\n\t\tconst currentCharacter = jsonString[index];\n\t\tconst nextCharacter = jsonString[index + 1];\n\n\t\tif (!isInsideComment && currentCharacter === '\"') {\n\t\t\t// Enter or exit string\n\t\t\tconst escaped = isEscaped(jsonString, index);\n\t\t\tif (!escaped) {\n\t\t\t\tisInsideString = !isInsideString;\n\t\t\t}\n\t\t}\n\n\t\tif (isInsideString) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (!isInsideComment && currentCharacter + nextCharacter === '//') {\n\t\t\t// Enter single-line comment\n\t\t\tbuffer += jsonString.slice(offset, index);\n\t\t\toffset = index;\n\t\t\tisInsideComment = singleComment;\n\t\t\tindex++;\n\t\t} else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\\r\\n') {\n\t\t\t// Exit single-line comment via \\r\\n\n\t\t\tindex++;\n\t\t\tisInsideComment = false;\n\t\t\tbuffer += strip(jsonString, offset, index);\n\t\t\toffset = index;\n\t\t\tcontinue;\n\t\t} else if (isInsideComment === singleComment && currentCharacter === '\\n') {\n\t\t\t// Exit single-line comment via \\n\n\t\t\tisInsideComment = false;\n\t\t\tbuffer += strip(jsonString, offset, index);\n\t\t\toffset = index;\n\t\t} else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {\n\t\t\t// Enter multiline comment\n\t\t\tbuffer += jsonString.slice(offset, index);\n\t\t\toffset = index;\n\t\t\tisInsideComment = multiComment;\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t} else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {\n\t\t\t// Exit multiline comment\n\t\t\tindex++;\n\t\t\tisInsideComment = false;\n\t\t\tbuffer += strip(jsonString, offset, index + 1);\n\t\t\toffset = index + 1;\n\t\t\tcontinue;\n\t\t} else if (trailingCommas && !isInsideComment) {\n\t\t\tif (commaIndex !== -1) {\n\t\t\t\tif (currentCharacter === '}' || currentCharacter === ']') {\n\t\t\t\t\t// Strip trailing comma\n\t\t\t\t\tbuffer += jsonString.slice(offset, index);\n\t\t\t\t\tresult += strip(buffer, 0, 1) + buffer.slice(1);\n\t\t\t\t\tbuffer = '';\n\t\t\t\t\toffset = index;\n\t\t\t\t\tcommaIndex = -1;\n\t\t\t\t} else if (currentCharacter !== ' ' && currentCharacter !== '\\t' && currentCharacter !== '\\r' && currentCharacter !== '\\n') {\n\t\t\t\t\t// Hit non-whitespace following a comma; comma is not trailing\n\t\t\t\t\tbuffer += jsonString.slice(offset, index);\n\t\t\t\t\toffset = index;\n\t\t\t\t\tcommaIndex = -1;\n\t\t\t\t}\n\t\t\t} else if (currentCharacter === ',') {\n\t\t\t\t// Flush buffer prior to this point, and save new comma index\n\t\t\t\tresult += buffer + jsonString.slice(offset, index);\n\t\t\t\tbuffer = '';\n\t\t\t\toffset = index;\n\t\t\t\tcommaIndex = index;\n\t\t\t}\n\t\t}\n\t}\n\n\tconst remaining = (isInsideComment === singleComment)\n\t\t? strip(jsonString, offset)\n\t\t: jsonString.slice(offset);\n\n\treturn result + buffer + remaining;\n}\n"]}

package/package.json

@@ -1,17 +1,26 @@
 {
   "name": "syncodemayo",
-  "version": "1.0.9",
+  "version": "2.0.0",
   "description": "A simple FTP syncing tool",
-  "main": "index.js",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "bin": {
-    "syncodemayo": "./cli.js"
+    "syncodemayo": "dist/cli.js"
+  },
+  "files": [
+    "dist",
+    "CHANGELOG.md"
+  ],
+  "engines": {
+    "node": ">=22.17"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "compile": "tsc -p ./tsconfig.json && echo 'Finished compile.'",
+    "test": "bun run compile && node --test \"test/**/*.test.mjs\"",
+    "compile": "tsc -p ./tsconfig.json && chmod +x dist/cli.js && echo 'Finished compile.'",
     "compile:watch": "tsc --watch -p ./tsconfig.json",
-    "version:bump": "npm version patch",
-    "prepublishOnly": "npm run version:bump && npm run compile"
+    "smoke:pack": "node scripts/smoke-pack.mjs",
+    "prepublishOnly": "bun run test"
   },
   "repository": {
     "type": "git",
@@ -24,25 +33,14 @@
   },
   "homepage": "https://github.com/mattmccray/syncodemayo#readme",
   "dependencies": {
-    "commander": "^2.11.0",
-    "crc": "3.4.1",
-    "dotenv": "^4.0.0",
-    "glob": "^7.1.2",
-    "joi": "^10.6.0",
-    "jsftp": "1.3.1",
-    "jsftp-mkdirp": "0.1.2",
-    "minimatch": "^3.0.4",
-    "strip-json-comments": "^2.0.1",
-    "yesno": "^0.0.1"
+    "basic-ftp": "^6.2.6"
   },
   "devDependencies": {
-    "@types/commander": "^2.9.1",
-    "@types/crc": "^3.4.0",
-    "@types/dotenv": "^4.0.0",
-    "@types/glob": "^5.0.30",
-    "@types/joi": "^10.4.0",
-    "@types/minimatch": "^2.0.29",
-    "eslint": "^4.3.0",
-    "typescript": "^2.4.2"
-  }
+    "@types/node": "^22.20.5",
+    "ajv": "^8.20.0",
+    "ajv-draft-04": "^1.0.0",
+    "ftp-srv": "^4.6.3",
+    "typescript": "^5.9.3"
+  },
+  "packageManager": "bun@1.4.4"
 }

package/.npmignore

@@ -1,9 +0,0 @@
-# ignore the .ts files
-*.ts
-
-# include the .d.ts files
-!*.d.ts
-
-*.map
-
-.vscode/*

package/cli.js

@@ -1,102 +0,0 @@
-#!/usr/bin/env node --harmony
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dotenv = require("dotenv");
-dotenv.config();
-const CLI = require("./lib/Cli");
-const Log = require("./lib/Log");
-const program = require("commander");
-const defaultTarget = undefined;
-let syncTarget = undefined;
-let command = 'help';
-program
-    .version('1.0.0')
-    .option('-c, --config [file]', 'Specify local config [file]')
-    .option('-v, --verbose', 'Verbose logging', false)
-    .option('-q, --quiet', 'Minimal logging', false);
-program
-    .command('init [target]')
-    .description("Configure local folder and/or server to sync")
-    .action((target) => {
-    syncTarget = target || defaultTarget;
-    command = 'init';
-});
-program
-    .command('changes [target]')
-    .alias('diff')
-    .description("Perform sync dry run and display the changes")
-    .action((target) => {
-    syncTarget = target || defaultTarget;
-    command = 'changes';
-});
-program
-    .command('verify [target]')
-    .description("Verify server is configured")
-    .action((target) => {
-    syncTarget = target || defaultTarget;
-    command = 'check';
-});
-program
-    .command('sync [target]')
-    .description("Perform sync to server")
-    .option('-f, --force', "Don't prompt before uploading.", false)
-    .action((target, options) => {
-    syncTarget = target || defaultTarget;
-    command = options.force ? 'syncf' : 'sync';
-});
-program
-    .command('ls')
-    .description("List defined targets in config")
-    .action(() => {
-    command = "ls";
-});
-program.parse(process.argv);
-CLI.setFlags({
-    logLevel: program.verbose
-        ? Log.LogLevel.Debug
-        : program.quiet
-            ? Log.LogLevel.Info
-            : Log.LogLevel.Default
-});
-switch (command) {
-    case "changes":
-        Log.debug(`Performing '${command}' on target: ${syncTarget || '(default)'}...\n`);
-        CLI.changes(program.config, syncTarget).then(showDone).catch(showError);
-        break;
-    case "check":
-        Log.debug(`Performing '${command}' on target: ${syncTarget || '(default)'}...\n`);
-        CLI.check(program.config, syncTarget).then(showDone).catch(showError);
-        break;
-    case "init":
-        Log.debug(`Performing '${command}' on target: ${syncTarget || '(default)'}...\n`);
-        CLI.init(program.config, syncTarget).then(showDone).catch(showError);
-        break;
-    case "ls":
-        Log.debug(`Performing '${command}'...\n`);
-        CLI.ls(program.config).then(showDone).catch(showError);
-        break;
-    case "sync":
-        Log.debug(`Performing '${command}' on target: ${syncTarget || '(default)'}\n...`);
-        CLI.sync(program.config, syncTarget, false).then(showDone).catch(showError);
-        break;
-    case "syncf":
-        Log.debug(`Performing (forced) 'sync' on target: ${syncTarget || '(default)'}\n...`);
-        CLI.sync(program.config, syncTarget, true).then(showDone).catch(showError);
-        break;
-    case "help":
-    default:
-        syncTarget = "app";
-        program.help();
-}
-function showDone() {
-    Log.log("\nDone.");
-    process.exit(0);
-}
-function showError(err) {
-    console.error("\n(!)", err.message, "\n\n", err);
-    // if (program.verbose) {
-    //   console.error(err)
-    // }
-    process.exit(1);
-}
-//# sourceMappingURL=cli.js.map

package/index.d.ts

@@ -1 +0,0 @@
-export * from './lib';

package/index.js

@@ -1,7 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./lib"));
-//# sourceMappingURL=index.js.map

package/lib/Cli.js

@@ -1,130 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Log = require("./Log");
-const Client_1 = require("./Client");
-function setFlags(flags) {
-    Log.setLogLevel(flags.logLevel);
-}
-exports.setFlags = setFlags;
-function changes(configPath, target) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = yield Client_1.Client.create(configPath);
-        const changeset = yield client.getTargetServer(target).sync(true);
-        if (changeset == null)
-            throw new Error("Change detection failed.");
-        const added = changeset.added.length;
-        const changed = changeset.changed.length;
-        const removed = changeset.removed.length;
-        if (added + changed + removed === 0) {
-            Log.log("\nNo changes detected.");
-            return true;
-        }
-        if (added > 0) {
-            Log.info("\nNew Local Files: (%s)", added);
-            changeset.added.forEach(f => Log.log(" -", f));
-        }
-        if (changed > 0) {
-            Log.info("\nChanged Local Files: (%s)", changeset.changed.length);
-            changeset.changed.forEach(f => Log.log(" -", f));
-        }
-        if (removed > 0) {
-            Log.info(`\nRemoved Local Files${client.config.local.deleteRemoteFiles ? '' : ' (disabled)'}: (%s)`, changeset.removed.length);
-            changeset.removed.forEach(f => Log.log(" -", f));
-        }
-        return true;
-    });
-}
-exports.changes = changes;
-function check(configPath, target) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = yield Client_1.Client.create(configPath);
-        if (client.hasError) {
-            throw client.loadError || client.parseError;
-        }
-        if (!client.hasConfig && !client.hasError) {
-            Log.urgent("This directory isn't configured for SyncoDeMayo!");
-            return false;
-        }
-        const targetServer = client.getTargetServer(target);
-        const isServerConfigured = yield targetServer.verify();
-        if (isServerConfigured) {
-            Log.info("Target", JSON.stringify(targetServer.name), "is ready for syncing.");
-        }
-        else {
-            Log.urgent("Target", JSON.stringify(targetServer.name), "isn't configured, run init.");
-            return false;
-        }
-        return true;
-    });
-}
-exports.check = check;
-function init(configPath, target) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = yield Client_1.Client.create(configPath);
-        if (!client.hasConfig && client.hasError) {
-            throw client.loadError || client.parseError;
-        }
-        if (!client.hasConfig) {
-            yield client.createConfig(configPath);
-            Log.info("Created local config at", configPath);
-            return true;
-        }
-        const targetServer = client.getTargetServer(target);
-        const isServerConfigured = yield targetServer.verify();
-        if (!isServerConfigured) {
-            yield targetServer.prepare();
-            Log.info("Created", targetServer.config.cache, "on server target", targetServer.config._name);
-            return true;
-        }
-        Log.info("Everything seems to be configured correctly.");
-        return false;
-    });
-}
-exports.init = init;
-function ls(configPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = yield Client_1.Client.create(configPath);
-        const targets = yield client.getTargetNames();
-        Log.urgent("Defined server targets:");
-        targets.forEach(name => {
-            const target = client.config.targets[name];
-            const bullet = client.config.local.defaultTarget === target._name
-                ? " *"
-                : " -";
-            Log.urgent(bullet, name, `\t(${target.user}@${target.host}:${target.path})`);
-        });
-        return true;
-    });
-}
-exports.ls = ls;
-function sync(configPath, target, forceConfirmation = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = yield Client_1.Client.create(configPath);
-        if (!client.hasConfig) {
-            if (client.hasError)
-                throw client.loadError || client.parseError;
-            else
-                throw new Error("This directory isn't configured for SyncoDeMayo!");
-        }
-        const changes = yield client.getTargetServer(target).sync(false, forceConfirmation);
-        if (changes != null) {
-            Log.info("\nSummary:");
-            Log.info(" %s files uploaded.", changes.added.length + changes.changed.length);
-            changes.added.forEach(path => Log.log("  +", path));
-            changes.changed.forEach(path => Log.log("  -", path));
-            Log.info(` %s files removed. ${client.config.local.deleteRemoteFiles ? '' : '(disabled)'}`, changes.removed.length);
-            changes.removed.forEach(path => Log.log("  x", path));
-        }
-        return true;
-    });
-}
-exports.sync = sync;
-//# sourceMappingURL=Cli.js.map