Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: archfirst/joinjs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: archfirst/joinjs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 10 commits
  • 6 files changed
  • 5 contributors

Commits on Feb 15, 2019

  1. refactor: drop lodash dependency

    fix #19
    leeoniya committed Feb 15, 2019
    Copy the full SHA
    9a0c352 View commit details
  2. Merge pull request #20 from leeoniya/drop-lodash

    refactor: drop lodash dependency
    nareshbhatia authored Feb 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3f1088c View commit details
  3. Copy the full SHA
    3f55faa View commit details

Commits on May 28, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c073472 View commit details
  2. Copy the full SHA
    d427860 View commit details
  3. build: removed semantic-release

    Will use npm publish for better control
    nareshbhatia committed May 28, 2020
    Copy the full SHA
    eb45bab View commit details

Commits on Aug 30, 2020

  1. Fix typos (#28)

    The original file contained a typo at 3 places. (colmun instead of column)
    dgergely authored Aug 30, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ee3608a View commit details
  2. Copy the full SHA
    a1c349d View commit details

Commits on Oct 9, 2020

  1. Update type (#29)

    kelvien authored Oct 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6eae8f5 View commit details
  2. Copy the full SHA
    3a72248 View commit details
Showing with 4,168 additions and 9,145 deletions.
  1. +1 −2 .travis.yml
  2. +1 −0 commitlint.config.js
  3. +28 −0 index.d.ts
  4. +4,081 −9,081 package-lock.json
  5. +31 −43 package.json
  6. +26 −19 src/index.js
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ notifications:
node_js:
- node
script:
- npm run test:prod && npm run build
- npm run build:local
after_success:
- npm run report-coverage
- npm run semantic-release
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = {extends: ['@commitlint/config-conventional']}
28 changes: 28 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
declare module "join-js" {
export type ResultMap = {
mapId: string;
createNew?: () => any;
idProperty?: string | { name: string, column: string } | (string | { name: string, column: string })[];
properties?: (string | {
name: string;
column: string;
})[];
associations?: {
name: string;
mapId: string;
columnPrefix?: string;
}[];
collections?: {
name: string;
mapId: string;
columnPrefix?: string;
}[];
};
declare function NotFoundError(message?: string): void;
const JoinJs: {
map(resultSet: any[], maps: ResultMap[], mapId: string, columnPrefix?: string): any;
mapOne(resultSet: any[], maps: ResultMap[], mapId: string, columnPrefix?: string, isRequired?: boolean): any;
NotFoundError: NotFoundError
};
export default JoinJs;
}
Loading