Work to support PR #734. Renamed code-export-utils to side-utils, which will be a public package. Placed the code-export specific bits behind codeExport so it can be destructured.

David Haeffner · David Haeffner · commit 75b941b214ed · 2019-06-30T15:55:26.000+03:00
diff --git a/packages/code-export-java-junit/__test__/src/command.spec.js b/packages/code-export-java-junit/__test__/src/command.spec.js
@@ -21,7 +21,7 @@ import {
   ControlFlowCommandNames,
 } from '../../../selenium-ide/src/neo/models/Command'
 import { opts } from '../../src/index'
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const commandPrefixPadding = opts.commandPrefixPadding
 
diff --git a/packages/code-export-java-junit/__test__/src/index.spec.js b/packages/code-export-java-junit/__test__/src/index.spec.js
@@ -28,7 +28,7 @@ function readFile(filename) {
         '..',
         '..',
         '..',
-        'code-export-utils',
+        'side-utils',
         '__test__',
         'test-files',
         filename
diff --git a/packages/code-export-java-junit/package.json b/packages/code-export-java-junit/package.json
@@ -21,6 +21,6 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "code-export-utils": "^3.10.0"
+    "@seleniumhq/side-utils": "^3.10.0"
   }
 }
diff --git a/packages/code-export-java-junit/src/command.js b/packages/code-export-java-junit/src/command.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import location from './location'
 import selection from './selection'
 
diff --git a/packages/code-export-java-junit/src/hook.js b/packages/code-export-java-junit/src/hook.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   afterAll,
diff --git a/packages/code-export-java-junit/src/index.js b/packages/code-export-java-junit/src/index.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import emitter from './command'
 import location from './location'
 import { generateHooks } from './hook'
diff --git a/packages/code-export-java-junit/src/location.js b/packages/code-export-java-junit/src/location.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/code-export-java-junit/src/selection.js b/packages/code-export-java-junit/src/selection.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/code-export-javascript-mocha/__test__/src/command.spec.js b/packages/code-export-javascript-mocha/__test__/src/command.spec.js
@@ -21,7 +21,7 @@ import {
   ControlFlowCommandNames,
 } from '../../../selenium-ide/src/neo/models/Command'
 import { opts } from '../../src/index'
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const commandPrefixPadding = opts.commandPrefixPadding
 
diff --git a/packages/code-export-javascript-mocha/__test__/src/index.spec.js b/packages/code-export-javascript-mocha/__test__/src/index.spec.js
@@ -28,7 +28,7 @@ function readFile(filename) {
         '..',
         '..',
         '..',
-        'code-export-utils',
+        'side-utils',
         '__test__',
         'test-files',
         filename
diff --git a/packages/code-export-javascript-mocha/package.json b/packages/code-export-javascript-mocha/package.json
@@ -21,6 +21,6 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "code-export-utils": "^3.10.0"
+    "@seleniumhq/side-utils": "^3.10.0"
   }
 }
diff --git a/packages/code-export-javascript-mocha/src/command.js b/packages/code-export-javascript-mocha/src/command.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import location from './location'
 import selection from './selection'
 
diff --git a/packages/code-export-javascript-mocha/src/hook.js b/packages/code-export-javascript-mocha/src/hook.js
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   afterAll,
diff --git a/packages/code-export-javascript-mocha/src/index.js b/packages/code-export-javascript-mocha/src/index.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import emitter from './command'
 import location from './location'
 import { generateHooks } from './hook'
diff --git a/packages/code-export-javascript-mocha/src/location.js b/packages/code-export-javascript-mocha/src/location.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/code-export-javascript-mocha/src/selection.js b/packages/code-export-javascript-mocha/src/selection.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/code-export-python-pytest/__test__/src/command.spec.js b/packages/code-export-python-pytest/__test__/src/command.spec.js
@@ -21,7 +21,7 @@ import {
   ControlFlowCommandNames,
 } from '../../../selenium-ide/src/neo/models/Command'
 import { opts } from '../../src/index'
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const commandPrefixPadding = opts.commandPrefixPadding
 
diff --git a/packages/code-export-python-pytest/__test__/src/index.spec.js b/packages/code-export-python-pytest/__test__/src/index.spec.js
@@ -28,7 +28,7 @@ function readFile(filename) {
         '..',
         '..',
         '..',
-        'code-export-utils',
+        'side-utils',
         '__test__',
         'test-files',
         filename
diff --git a/packages/code-export-python-pytest/package.json b/packages/code-export-python-pytest/package.json
@@ -21,6 +21,6 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "code-export-utils": "^3.10.0"
+    "@seleniumhq/side-utils": "^3.10.0"
   }
 }
diff --git a/packages/code-export-python-pytest/src/command.js b/packages/code-export-python-pytest/src/command.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import location from './location'
 import selection from './selection'
 
diff --git a/packages/code-export-python-pytest/src/hook.js b/packages/code-export-python-pytest/src/hook.js
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   afterAll,
diff --git a/packages/code-export-python-pytest/src/index.js b/packages/code-export-python-pytest/src/index.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 import emitter from './command'
 import location from './location'
 import { generateHooks } from './hook'
diff --git a/packages/code-export-python-pytest/src/location.js b/packages/code-export-python-pytest/src/location.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/code-export-python-pytest/src/selection.js b/packages/code-export-python-pytest/src/selection.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import exporter from 'code-export-utils'
+import { codeExport as exporter } from '@seleniumhq/side-utils'
 
 const emitters = {
   id: emitId,
diff --git a/packages/side-utils/.babelrc b/packages/side-utils/.babelrc
diff --git a/packages/side-utils/__test__/src/code-export/emit.spec.js b/packages/side-utils/__test__/src/code-export/emit.spec.js
@@ -15,8 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { emitLocation, emitSelection, emitOriginTracing } from '../../src/emit'
-import TestCase from '../../../selenium-ide/src/neo/models/TestCase'
+import {
+  emitLocation,
+  emitSelection,
+  emitOriginTracing,
+} from '../../../src/code-export/emit'
+import TestCase from '../../../../selenium-ide/src/neo/models/TestCase'
 
 describe('Location emitter', () => {
   it('emits by sync emitter', () => {
diff --git a/packages/side-utils/__test__/src/code-export/find.spec.js b/packages/side-utils/__test__/src/code-export/find.spec.js
@@ -18,9 +18,9 @@
 import {
   findReusedTestMethods,
   findCommandThatOpensWindow,
-} from '../../src/find'
-import TestCase from '../../../selenium-ide/src/neo/models/TestCase'
-import Command from '../../../selenium-ide/src/neo/models/Command'
+} from '../../../src/code-export/find'
+import TestCase from '../../../../selenium-ide/src/neo/models/TestCase'
+import Command from '../../../../selenium-ide/src/neo/models/Command'
 
 describe('find', () => {
   describe('findCommandThatOpensWindow', () => {
diff --git a/packages/side-utils/__test__/src/code-export/hook.spec.js b/packages/side-utils/__test__/src/code-export/hook.spec.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import Hook from '../../src/hook'
+import Hook from '../../../src/code-export/hook'
 
 describe('Hooks', () => {
   it('should clear registered commands', () => {
diff --git a/packages/side-utils/__test__/src/code-export/parsers.spec.js b/packages/side-utils/__test__/src/code-export/parsers.spec.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { sanitizeName, capitalize } from '../../src/parsers'
+import { sanitizeName, capitalize } from '../../../src/code-export/parsers'
 
 describe('parsers', () => {
   it('should sanitize the name', () => {
diff --git a/packages/side-utils/__test__/src/code-export/preprocessor.spec.js b/packages/side-utils/__test__/src/code-export/preprocessor.spec.js
@@ -19,7 +19,7 @@ import {
   defaultPreprocessor,
   scriptPreprocessor,
   keysPreprocessor,
-} from '../../src/preprocessor'
+} from '../../../src/code-export/preprocessor'
 
 describe('preprocessors', () => {
   const variableLookup = varName => {
diff --git a/packages/side-utils/__test__/src/code-export/prettify.spec.js b/packages/side-utils/__test__/src/code-export/prettify.spec.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import prettify from '../../src/prettify'
+import prettify from '../../../src/code-export/prettify'
 
 describe('Prettify', () => {
   const commandPrefixPadding = '  '
diff --git a/packages/side-utils/__test__/src/code-export/register.spec.js b/packages/side-utils/__test__/src/code-export/register.spec.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { registerCommandEmitter } from '../../src/register'
+import { registerCommandEmitter } from '../../../src/code-export/register'
 
 describe('Register', () => {
   describe('Command Emitters', () => {
diff --git a/packages/side-utils/__test__/src/code-export/render.spec.js b/packages/side-utils/__test__/src/code-export/render.spec.js
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import render from '../../src/render'
-import { renderCommands } from '../../src/render'
-import { emitOriginTracing } from '../../src/emit'
-import TestCase from '../../../selenium-ide/src/neo/models/TestCase'
+import render from '../../../src/code-export/render'
+import { renderCommands } from '../../../src/code-export/render'
+import { emitOriginTracing } from '../../../src/code-export/emit'
+import TestCase from '../../../../selenium-ide/src/neo/models/TestCase'
 
 describe('Render', () => {
   const commandPrefixPadding = '  '
diff --git a/packages/side-utils/__test__/test-files/control-flow-suite.side b/packages/side-utils/__test__/test-files/control-flow-suite.side
diff --git a/packages/side-utils/__test__/test-files/nested-select-window-v2.side b/packages/side-utils/__test__/test-files/nested-select-window-v2.side
diff --git a/packages/side-utils/__test__/test-files/nested-select-window.side b/packages/side-utils/__test__/test-files/nested-select-window.side
diff --git a/packages/side-utils/__test__/test-files/select-window.side b/packages/side-utils/__test__/test-files/select-window.side
diff --git a/packages/side-utils/__test__/test-files/single-suite.side b/packages/side-utils/__test__/test-files/single-suite.side
diff --git a/packages/side-utils/__test__/test-files/single-test.side b/packages/side-utils/__test__/test-files/single-test.side
diff --git a/packages/side-utils/__test__/test-files/test-case-reuse.side b/packages/side-utils/__test__/test-files/test-case-reuse.side
diff --git a/packages/side-utils/package.json b/packages/side-utils/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "code-export-utils",
+  "name": "@seleniumhq/side-utils",
   "version": "3.10.0",
   "description": "Utils for Selenium IDE code export",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -9,7 +9,7 @@
     "export"
   ],
   "license": "Apache-2.0",
-  "private": true,
+  "private": false,
   "scripts": {
     "build": "babel -d dist src --ignore=__test__",
     "watch": "yarn build -w"
diff --git a/packages/side-utils/src/code-export/emit.js b/packages/side-utils/src/code-export/emit.js
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { preprocessParameter } from './preprocessor'
 import StringEscape from 'js-string-escape'
+import { preprocessParameter } from './preprocessor'
 import doRender from './render'
 import { registerMethod } from './register'
 import { findReusedTestMethods, findCommandThatOpensWindow } from './find'
diff --git a/packages/side-utils/src/code-export/find.js b/packages/side-utils/src/code-export/find.js
diff --git a/packages/side-utils/src/code-export/hook.js b/packages/side-utils/src/code-export/hook.js
diff --git a/packages/side-utils/src/code-export/index.js b/packages/side-utils/src/code-export/index.js
diff --git a/packages/side-utils/src/code-export/parsers.js b/packages/side-utils/src/code-export/parsers.js
diff --git a/packages/side-utils/src/code-export/preprocessor.js b/packages/side-utils/src/code-export/preprocessor.js
diff --git a/packages/side-utils/src/code-export/prettify.js b/packages/side-utils/src/code-export/prettify.js
diff --git a/packages/side-utils/src/code-export/register.js b/packages/side-utils/src/code-export/register.js
diff --git a/packages/side-utils/src/code-export/render.js b/packages/side-utils/src/code-export/render.js
diff --git a/packages/side-utils/src/index.js b/packages/side-utils/src/index.js
@@ -0,0 +1,22 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import codeExport from './code-export'
+
+module.exports = {
+  codeExport,
+}
diff --git a/packages/side-utils/yarn.lock b/packages/side-utils/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@`
`21`	`21`	`"@babel/preset-env": "^7.4.5"`
`22`	`22`	`},`
`23`	`23`	`"dependencies": {`
`24`		`- "code-export-utils": "^3.10.0"`
	`24`	`+ "@seleniumhq/side-utils": "^3.10.0"`
`25`	`25`	`}`
`26`	`26`	`}`