@dittowords/cli 3.9.0 → 3.10.0

package/lib/pull.ts

@@ -43,13 +43,20 @@ const getFormatDataIsValid = {
   "ios-stringsdict": (data: string) => data.includes("<key>"),
 };
 
-const getFormat = (formatFromSource: string | undefined): SupportedFormat => {
-  const f = formatFromSource as SupportedFormat | undefined;
-  if (f && SUPPORTED_FORMATS.includes(f)) {
-    return f;
+const getFormat = (
+  formatFromSource: string | string[] | undefined
+): SupportedFormat[] => {
+  const formats = (
+    Array.isArray(formatFromSource) ? formatFromSource : [formatFromSource]
+  ).filter((format) =>
+    SUPPORTED_FORMATS.includes(format as SupportedFormat)
+  ) as SupportedFormat[];
+
+  if (formats.length) {
+    return formats;
   }
 
-  return "flat";
+  return ["flat"];
 };
 
 const getFormatExtension = (format: SupportedFormat) => {
@@ -226,7 +233,7 @@ async function downloadAndSave(
     componentFolders,
   } = source;
 
-  const format = getFormat(formatFromSource);
+  const formats = getFormat(formatFromSource);
 
   let msg = "";
   const spinner = ora(msg);
@@ -243,7 +250,7 @@ async function downloadAndSave(
 
     const meta = options ? options.meta : {};
 
-    if (shouldFetchComponentLibrary) {
+    async function fetchComponentLibrary(format: SupportedFormat) {
       // Always include a variant with an apiID of undefined to ensure that we
       // fetch the base text for the component library.
       const componentVariants = [{ apiID: undefined }, ...(variants || [])];
@@ -290,7 +297,13 @@ async function downloadAndSave(
       msg += messages.join("");
     }
 
-    if (validProjects.length) {
+    if (shouldFetchComponentLibrary) {
+      for (const format of formats) {
+        await fetchComponentLibrary(format);
+      }
+    }
+
+    async function fetchProjects(format: SupportedFormat) {
       msg += variants
         ? await downloadAndSaveVariants(
             variants,
@@ -312,6 +325,12 @@ async function downloadAndSave(
           );
     }
 
+    if (validProjects.length) {
+      for (const format of formats) {
+        await fetchProjects(format);
+      }
+    }
+
     const sources = [...validProjects];
     if (shouldFetchComponentLibrary) {
       sources.push({
@@ -321,7 +340,8 @@ async function downloadAndSave(
       });
     }
 
-    if (JSON_FORMATS.includes(format)) msg += generateJsDriver(sources);
+    if (formats.some((f) => JSON_FORMATS.includes(f)))
+      msg += generateJsDriver(sources);
 
     msg += `\n${output.success("Done")}!`;
 

package/lib/types.ts

@@ -45,7 +45,7 @@ export interface SourceInformation {
   validProjects: Project[];
   shouldFetchComponentLibrary: boolean;
   variants: boolean;
-  format: string | undefined;
+  format: string | string[] | undefined;
   status: string | undefined;
   richText: boolean | undefined;
   componentFolders: ComponentFolder[] | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dittowords/cli",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Command Line Interface for Ditto (dittowords.com).",
   "main": "bin/index.js",
   "scripts": {

package/.idea/cli.iml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/bin" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,65 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="CSS">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/cli.iml" filepath="$PROJECT_DIR$/.idea/cli.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myRunOnSave" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

package/.idea/workspace.xml

@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="d2834f12-3435-41b5-8efa-c62f3f4baa0d" name="Changes" comment="Add remaining column mappings">
-      <change beforePath="$PROJECT_DIR$/lib/ditto.ts" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ditto.ts" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="ProjectId" id="2QnCWGsMrfsa99lySJEn0m45dgP" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showMembers" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/http" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.standard" value="true" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.standard" value="" />
-    <property name="nodejs.jest.jest_package" value="$PROJECT_DIR$/node_modules/jest" />
-    <property name="nodejs_package_manager_path" value="yarn" />
-    <property name="prettierjs.PrettierConfiguration.Package" value="$PROJECT_DIR$/node_modules/prettier" />
-    <property name="settings.editor.selected.configurable" value="settings.javascript.prettier" />
-    <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/lib/http" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="generate-suggestions.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
-      <node-interpreter value="project" />
-      <node-options value="" />
-      <jest-package value="$PROJECT_DIR$/node_modules/jest" />
-      <working-dir value="$PROJECT_DIR$" />
-      <envs />
-      <scope-kind value="TEST_FILE" />
-      <test-file value="$PROJECT_DIR$/lib/generate-suggestions.test.ts" />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Jest.generate-suggestions.test.ts" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="d2834f12-3435-41b5-8efa-c62f3f4baa0d" name="Changes" comment="" />
-      <created>1685979990050</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1685979990050</updated>
-      <workItem from="1685979994523" duration="162000" />
-      <workItem from="1685980169522" duration="92000" />
-      <workItem from="1685980274824" duration="41000" />
-      <workItem from="1685980327587" duration="27000" />
-      <workItem from="1685980367078" duration="303000" />
-      <workItem from="1685980682884" duration="824000" />
-      <workItem from="1685986712012" duration="5115000" />
-      <workItem from="1686000886228" duration="2633000" />
-      <workItem from="1686069506429" duration="76000" />
-      <workItem from="1686087849012" duration="140000" />
-      <workItem from="1686168915499" duration="2643000" />
-      <workItem from="1686172029566" duration="5629000" />
-      <workItem from="1686604031092" duration="6110000" />
-      <workItem from="1686665537695" duration="7000" />
-      <workItem from="1686666962638" duration="1318000" />
-      <workItem from="1686672751040" duration="103000" />
-      <workItem from="1686758001057" duration="1199000" />
-      <workItem from="1686764622070" duration="41000" />
-    </task>
-    <task id="LOCAL-00001" summary="Remove eslint">
-      <created>1685986802039</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1685986802039</updated>
-    </task>
-    <task id="LOCAL-00002" summary="Add -cf flag to generate-suggestions">
-      <created>1685993746601</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1685993746601</updated>
-    </task>
-    <task id="LOCAL-00003" summary="Remove redundant variable">
-      <created>1685993770336</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1685993770336</updated>
-    </task>
-    <task id="LOCAL-00004" summary="Add command to show component-folders">
-      <created>1686001523646</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1686001523646</updated>
-    </task>
-    <task id="LOCAL-00005" summary="Command description">
-      <created>1686002294377</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1686002294377</updated>
-    </task>
-    <task id="LOCAL-00006" summary="Stringify print">
-      <created>1686069574434</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1686069574434</updated>
-    </task>
-    <task id="LOCAL-00007" summary="Add import-component function">
-      <created>1686238984111</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1686238984111</updated>
-    </task>
-    <task id="LOCAL-00008" summary="simplify generate-suggestions flag passing">
-      <created>1686244114837</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1686244114837</updated>
-    </task>
-    <task id="LOCAL-00009" summary="Add import-components command">
-      <created>1686611039840</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1686611039840</updated>
-    </task>
-    <task id="LOCAL-00010" summary="Add flag check for csv files">
-      <created>1686667259055</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1686667259055</updated>
-    </task>
-    <task id="LOCAL-00011" summary="Add (.csv format only)">
-      <created>1686758043695</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1686758043695</updated>
-    </task>
-    <task id="LOCAL-00012" summary="Add remaining column mappings">
-      <created>1686758202293</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1686758202293</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="Remove eslint" />
-    <MESSAGE value="Add -cf flag to generate-suggestions" />
-    <MESSAGE value="Remove redundant variable" />
-    <MESSAGE value="Add command to show component-folders" />
-    <MESSAGE value="Command description" />
-    <MESSAGE value="Stringify print" />
-    <MESSAGE value="Add import-component function" />
-    <MESSAGE value="simplify generate-suggestions flag passing" />
-    <MESSAGE value="Add import-components command" />
-    <MESSAGE value="Add flag check for csv files" />
-    <MESSAGE value="Add (.csv format only)" />
-    <MESSAGE value="Add remaining column mappings" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add remaining column mappings" />
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>