Merge branch 'master' into fix/adjust-error-for-missing-cloudname

Author: patrick-tolosa

.eslintrc

@@ -2,7 +2,8 @@
   "root": true,
   "parser": "@typescript-eslint/parser",
   "plugins": [
-    "@typescript-eslint"
+    "@typescript-eslint",
+    "import"
   ],
   "extends": [
     "eslint:recommended",
@@ -35,6 +36,7 @@
     "comma-spacing" : "error",
     "no-multi-spaces" : "error",
     "prefer-template" : "error",
+    "import/extensions": [2, "ignorePackages"],
     "max-nested-callbacks" : ["error",{
       "max": 3
     }],

__TESTS_BUNDLE_SIZE__/bundleSizeTestCases.ts

@@ -15,7 +15,7 @@ import importFromPackage from "./utils/stringGenerators/importFromPackage";
 const bundleSizeTestCases:ITestCase[] = [
   {
     name: 'Tests CloudinaryImage with Resize',
-    sizeLimitInKB: 20,
+    sizeLimitInKB: 17,
     importsArray: [
       importFromDist('assets/CloudinaryImage', 'CloudinaryImage'),
       importFromDist('instance/Cloudinary', 'Cloudinary'),
@@ -24,7 +24,7 @@ const bundleSizeTestCases:ITestCase[] = [
   },
   {
     name: 'Tests CloudinaryImage with Resize and Adjust',
-    sizeLimitInKB: 30,
+    sizeLimitInKB: 20,
     importsArray: [
       importFromDist('assets/CloudinaryImage', 'CloudinaryImage'),
       importFromDist('instance/Cloudinary', 'Cloudinary'),
@@ -34,7 +34,7 @@ const bundleSizeTestCases:ITestCase[] = [
   },
   {
     name: 'Tests CloudinaryImage with Resize, Adjust and Border',
-    sizeLimitInKB: 30,
+    sizeLimitInKB: 20,
     importsArray: [
       importFromDist('assets/CloudinaryImage', 'CloudinaryImage'),
       importFromDist('instance/Cloudinary', 'Cloudinary'),
@@ -45,7 +45,7 @@ const bundleSizeTestCases:ITestCase[] = [
   },
   {
     name: 'Tests CloudinaryImage image with Resize, adjust and delivery',
-    sizeLimitInKB: 32,
+    sizeLimitInKB: 21,
     importsArray: [
       importFromDist('assets/CloudinaryImage', 'CloudinaryImage'),
       importFromDist('instance/Cloudinary', 'Cloudinary'),
@@ -56,7 +56,7 @@ const bundleSizeTestCases:ITestCase[] = [
   },
   {
     name: 'Tests Overlay imports',
-    sizeLimitInKB: 50,
+    sizeLimitInKB: 20,
     importsArray: [
       importFromDist('assets/CloudinaryImage', 'CloudinaryImage'),
       importFromDist('actions/overlay', 'Overlay'),
@@ -67,7 +67,7 @@ const bundleSizeTestCases:ITestCase[] = [
   },
   {
     name: 'Import backwards compatibility function',
-    sizeLimitInKB: 57,
+    sizeLimitInKB: 45,
     importsArray: [
       importFromPackage('createCloudinaryLegacyURL')
     ]
@@ -76,7 +76,28 @@ const bundleSizeTestCases:ITestCase[] = [
     name: 'Import all of the SDK',
     sizeLimitInKB: 118,
     importsArray: [
-      importFromPackage('CloudinaryURLGEN')
+      importFromPackage('* as CloudinaryURLGEN')
+    ]
+  },
+  {
+    name: 'Import a Transformation Object',
+    sizeLimitInKB: 5,
+    importsArray: [
+      importFromPackage('Transformation')
+    ]
+  },
+  {
+    name: 'Import All Actions',
+    sizeLimitInKB: 30,
+    importsArray: [
+      importFromPackage('Actions')
+    ]
+  },
+  {
+    name: 'Import All Qualifiers',
+    sizeLimitInKB: 35,
+    importsArray: [
+      importFromPackage('Qualifiers')
     ]
   }
 ];

__TESTS_BUNDLE_SIZE__/bundleSizeTestRunner.ts

@@ -28,6 +28,7 @@ async function bundleSizeTestRunner():Promise<void> {
     const OUTPUT_FILE = `bundle${i}`;
     const TEST_NAME = testCases[i].name;
     const EXPECTED_SIZE_IN_KB = testCases[i].sizeLimitInKB;
+    const ALLOWED_MIN_SIZE_IN_KB = testCases[i].minAllowedSize || 2;
 
     // Create the entry file for Webpack
     log.debug('Starting to build webpack loop');
@@ -42,10 +43,11 @@ async function bundleSizeTestRunner():Promise<void> {
     const bundleInfo = getBundleInfo(OUTPUT_FILE);
     const ACTUAL_SIZE_IN_KB = Math.round(bundleInfo.size / 1024);
 
-    if (ACTUAL_SIZE_IN_KB <= EXPECTED_SIZE_IN_KB) {
+
+    if (ACTUAL_SIZE_IN_KB <= EXPECTED_SIZE_IN_KB && ACTUAL_SIZE_IN_KB > ALLOWED_MIN_SIZE_IN_KB) {
       handleTestSuccess(testCases[i], ACTUAL_SIZE_IN_KB);
     } else {
-      handleTestError(TEST_NAME, EXPECTED_SIZE_IN_KB, ACTUAL_SIZE_IN_KB);
+      handleTestError(TEST_NAME, EXPECTED_SIZE_IN_KB, ACTUAL_SIZE_IN_KB, ALLOWED_MIN_SIZE_IN_KB);
       fail_count++;
     }
   }

__TESTS_BUNDLE_SIZE__/interfaces/ITestCase.ts

@@ -1,5 +1,9 @@
 export interface ITestCase {
   sizeLimitInKB: number,
+  // The minimum allowed size, a bundle size below this size will fail the test
+  // Useful to ensure that something is actually imported!
+  // Defaults internally to 2kb if field is omitted
+  minAllowedSize?:number,
   importsArray: string[],
   name: string,
   importString?: string

__TESTS_BUNDLE_SIZE__/utils/stringGenerators/importFromPackage.ts

@@ -5,10 +5,13 @@
  * @returns string
  */
 function importFromPackage(exportedObject: string): string {
+  const importString = exportedObject.includes('* as') ? exportedObject : `{${exportedObject}}`;
+  const variableName = exportedObject.includes('* as') ? exportedObject.split(' as ')[1] : exportedObject;
+
   return `
-    import {${exportedObject}} from "${process.cwd()}/dist";
+    import ${importString} from "${process.cwd()}/dist";
     // we console log to force the bundle not to tree shake
-    console.log(${exportedObject});  
+    console.log(${variableName});  
   `;
 }
 

__TESTS_BUNDLE_SIZE__/utils/testLifeCycle/handleTestError.ts

@@ -6,9 +6,9 @@ import log from "../log";
  * @param expected
  * @param received
  */
-function handleTestError(name: string, expected: number, received: number) {
+function handleTestError(name: string, expected: number, received: number, minAllowed: number) {
   log.error(name);
-  log.error(`\tExpected size: ${expected} KB`);
+  log.error(`\tExpected size(range): ${minAllowed} - ${expected} KB`);
   log.error(`\tActual size: ${received} KB\n`);
 }
 

__TESTS__/TestUtils/createCloudinaryFile.ts

@@ -1,6 +1,6 @@
 import ICloudConfig from "../../src/config/interfaces/Config/ICloudConfig";
 import IURLConfig from "../../src/config/interfaces/Config/IURLConfig";
-import {CloudinaryFile} from "../../src";
+import {CloudinaryFile} from "../../src/assets/CloudinaryFile";
 
 /**
  *

__TESTS__/backwardsComaptibility/createLegacyURL.test.ts

@@ -1,6 +1,6 @@
 import {createTestURL} from "./transformationLegacyTests/utils/createTestURL";
-import {createCloudinaryLegacyURL} from "../../src";
 import Transformation from "../../src/backwards/transformation";
+import {createCloudinaryLegacyURL} from "../../src/backwards/createCloudinaryLegacyURL";
 
 describe('Create legacy urls', () => {
   it('Should throw without cloudName', () => {

__TESTS__/backwardsComaptibility/transformationLegacyTests/utils/createTestURL.ts

@@ -1,6 +1,6 @@
 import {Cloudinary} from 'cloudinary-core';
-import {createCloudinaryLegacyURL} from "../../../../src";
 import {LegacyITransforamtionOptions} from "../../../../src/types/types";
+import {createCloudinaryLegacyURL} from "../../../../src/backwards/createCloudinaryLegacyURL";
 
 const CLegacy = Cloudinary.new( { cloud_name: "demo"});
 

__TESTS__/compilationsOutput.test.ts

@@ -30,7 +30,7 @@ import { FocusOn } from "qualifiers/focusOn";
 import { AutoFocus } from "qualifiers/autoFocus";
 import { VideoCodec } from "qualifiers/videoCodec";
 import { Adjust } from "actions/adjust";
-import { ImageTransformation } from "index";
+import { ImageTransformation } from "transformation/ImageTransformation";
 import { Effect } from "actions/effect";
 import { Conditional } from "actions/conditional";
 import { Underlay } from "actions/underlay";